Index: trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy	(revision 9940)
+++ trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy	(revision 9942)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui
-
-import org.openstreetmap.josm.data.osm.User;
 
 import static org.junit.Assert.*
@@ -10,4 +8,5 @@
 import org.openstreetmap.josm.JOSMFixture
 import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.osm.User
 import org.openstreetmap.josm.data.osm.UserInfo
 
@@ -39,5 +38,5 @@
 
     @Test
-    public void test_setAnonymouse() {
+    public void test_setAnonymous() {
         JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
 
@@ -120,6 +119,5 @@
 
     /**
-     * Preferences include neither an url nor a user name => we have
-     * an anonymous user
+     * Preferences include neither an url nor a user name => we have an anonymous user
      */
     @Test
@@ -140,6 +138,5 @@
 
     /**
-     * Preferences include neither an url nor a user name => we have
-     * an annoymous user
+     * Preferences include neither an url nor a user name => we have an anonymous user
      */
     @Test
@@ -154,10 +151,14 @@
         Main.pref.removePreferenceChangeListener im
 
-        Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-        Main.pref.put "osm-server.username", null
-
-        im.initFromPreferences()
-
-        assert im.isAnonymous()
+        try {
+            Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+            Main.pref.put "osm-server.username", null
+
+            im.initFromPreferences()
+
+            assert im.isAnonymous()
+        } finally {
+            Main.pref.addPreferenceChangeListener im
+        }
     }
 
@@ -172,14 +173,18 @@
         Main.pref.removePreferenceChangeListener im
 
-        // reset it
-        im.@userName = null
-        im.@userInfo = null
-
-        Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-        Main.pref.put "osm-server.username", "test"
-
-        im.initFromPreferences()
-
-        assert im.isPartiallyIdentified()
+        try {
+            // reset it
+            im.@userName = null
+            im.@userInfo = null
+
+            Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+            Main.pref.put "osm-server.username", "test"
+
+            im.initFromPreferences()
+
+            assert im.isPartiallyIdentified()
+        } finally {
+            Main.pref.addPreferenceChangeListener im
+        }
     }
 
@@ -196,12 +201,16 @@
         Main.pref.removePreferenceChangeListener im
 
-        im.setFullyIdentified "test1", new UserInfo(id: 1)
-
-        Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-        Main.pref.put "osm-server.username", "test2"
-
-        im.initFromPreferences()
-
-        assert im.isPartiallyIdentified()
+        try {
+            im.setFullyIdentified "test1", new UserInfo(id: 1)
+
+            Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+            Main.pref.put "osm-server.username", "test2"
+
+            im.initFromPreferences()
+
+            assert im.isPartiallyIdentified()
+        } finally {
+            Main.pref.addPreferenceChangeListener im
+        }
     }
 
@@ -218,12 +227,16 @@
         Main.pref.removePreferenceChangeListener im
 
-        im.setFullyIdentified "test1", new UserInfo(id: 1)
-
-        Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
-        Main.pref.put "osm-server.username", "test1"
-
-        im.initFromPreferences()
-
-        assert im.isFullyIdentified()
+        try {
+            im.setFullyIdentified "test1", new UserInfo(id: 1)
+
+            Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
+            Main.pref.put "osm-server.username", "test1"
+
+            im.initFromPreferences()
+
+            assert im.isFullyIdentified()
+        } finally {
+            Main.pref.addPreferenceChangeListener im
+        }
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 9940)
+++ trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 9942)
@@ -14,4 +14,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -138,4 +139,9 @@
     @Test
     public void testReadNotes() throws IOException, IllegalDataException {
+        if (Main.isDisplayingMapView()) {
+            for (NoteLayer nl : Main.map.mapView.getLayersOfType(NoteLayer.class)) {
+                Main.map.mapView.removeLayer(nl);
+            }
+        }
         final List<Layer> layers = testRead("notes.joz");
         assertSame(layers.size(), 1);