Index: trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 12727)
+++ trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 12728)
@@ -63,5 +63,5 @@
             MainApplication.getLayerManager().addLayer(layer);
             try {
-                new JoinAreasAction().join(ds.getWays());
+                new JoinAreasAction(false).join(ds.getWays());
             } finally {
                 // Ensure we clean the place before leaving, even if test fails.
@@ -125,5 +125,5 @@
                 assertTrue(test + "; expected way, but got: " + osm, osm instanceof Way);
             }
-            new JoinAreasAction().join((Collection) primitives);
+            new JoinAreasAction(false).join((Collection) primitives);
             Collection<OsmPrimitive> joinedCol = dsToJoin.getPrimitives(osm -> !osm.isDeleted() && Objects.equals(osm.get("test"), test));
             assertEquals("in test " + test + ":", 1, joinedCol.size());
Index: trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java	(revision 12727)
+++ trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java	(revision 12728)
@@ -15,5 +15,5 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.APIDataSet;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -46,6 +46,5 @@
         assertTrue(MainApplication.undoRedo.commands.isEmpty());
 
-        // Complete data set
-        Node emptyNode = new Node();
+        // Complete data set (except empty which cannot be tested anymore)
         Way emptyWay = new Way();
         Relation emptyRelation = new Relation();
@@ -75,5 +74,5 @@
         r2.put(" space_both ", "test");
         APIDataSet ads = new APIDataSet();
-        ads.init(Arrays.asList(emptyNode, emptyWay, emptyRelation, w1, w2, w3, w4, w5, w6, w7, r1, r2));
+        ads.init(new DataSet(emptyWay, emptyRelation, w1, w2, w3, w4, w5, w6, w7, r1, r2));
 
         MainApplication.undoRedo.commands.clear();
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java	(revision 12727)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java	(revision 12728)
@@ -90,10 +90,12 @@
     @Test
     public void testAddPrimitivesToRelation() {
-        assertNull(GenericRelationEditor.addPrimitivesToRelation(new Relation(1), Collections.<OsmPrimitive>emptyList()));
-        assertNull(GenericRelationEditor.addPrimitivesToRelation(new Relation(1), Collections.singleton(new Relation(1))));
+        Relation r = new Relation(1);
+        new DataSet(r);
+        assertNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.<OsmPrimitive>emptyList()));
+        assertNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Relation(1))));
 
-        assertNotNull(GenericRelationEditor.addPrimitivesToRelation(new Relation(1), Collections.singleton(new Node(1))));
-        assertNotNull(GenericRelationEditor.addPrimitivesToRelation(new Relation(1), Collections.singleton(new Way(1))));
-        assertNotNull(GenericRelationEditor.addPrimitivesToRelation(new Relation(1), Collections.singleton(new Relation(2))));
+        assertNotNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Node(1))));
+        assertNotNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Way(1))));
+        assertNotNull(GenericRelationEditor.addPrimitivesToRelation(r, Collections.singleton(new Relation(2))));
     }