Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 1910)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 1912)
@@ -20,12 +20,12 @@
     protected void populate() {
         Way w1 = new Way(1);
-          w1.addNode(new Node(10));
-          w1.addNode(new Node(11));
+        w1.addNode(new Node(10));
+        w1.addNode(new Node(11));
 
         Way w2 = new Way(1);
-          w2.addNode(new Node(10));
-          w2.addNode(new Node(11));
+        w2.addNode(new Node(10));
+        w2.addNode(new Node(11));
 
-       dialog.getConflictResolver().populate(w1, w2);
+        dialog.getConflictResolver().populate(w1, w2);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 1910)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 1912)
@@ -2,11 +2,7 @@
 package org.openstreetmap.josm.data.osm.visitor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collection;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -17,4 +13,6 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+
+import static org.junit.Assert.*;
 
 public class MergeSourceBuildingVisitorTest {
@@ -186,9 +184,9 @@
         Node n = (Node)hull.getPrimitiveById(21);
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         n = (Node)hull.getPrimitiveById(22);
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         Relation r = (Relation)hull.getPrimitiveById(40);
@@ -310,9 +308,9 @@
         Node n = (Node)lookupByName(hull.nodes, "n21");
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         n = (Node)lookupByName(hull.nodes, "n22");
         assertNotNull(n);
-        assertTrue(w.getNodes().contains(n));
+        assertTrue(w.containsNode(n));
 
         Relation r = (Relation)lookupByName(hull.relations, "r40");