Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 12671)
+++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 12672)
@@ -59,13 +59,13 @@
     @Test
     public void testExecuteUndoCommand() {
-        OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
-        ConflictAddCommand cmd = new ConflictAddCommand(layer, conflict);
+        ConflictAddCommand cmd = new ConflictAddCommand(ds, conflict);
         assertTrue(cmd.executeCommand());
-        assertFalse(layer.getConflicts().isEmpty());
-        assertTrue(layer.getConflicts().hasConflict(conflict));
+        assertFalse(ds.getConflicts().isEmpty());
+        assertTrue(ds.getConflicts().hasConflict(conflict));
         cmd.undoCommand();
-        assertFalse(layer.getConflicts().hasConflict(conflict));
-        assertTrue(layer.getConflicts().isEmpty());
+        assertFalse(ds.getConflicts().hasConflict(conflict));
+        assertTrue(ds.getConflicts().isEmpty());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java	(revision 12671)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java	(revision 12672)
@@ -47,6 +47,5 @@
     public void testBuildDataText() {
         DataSet ds = new DataSet();
-        OsmDataLayer layer = new OsmDataLayer(ds, "", null);
-        assertEquals("", InspectPrimitiveDialog.buildDataText(layer, new ArrayList<>(ds.allPrimitives())));
+        assertEquals("", InspectPrimitiveDialog.buildDataText(ds, new ArrayList<>(ds.allPrimitives())));
         Node n = new Node(LatLon.ZERO);
         n.setOsmId(1, 1);
@@ -61,5 +60,5 @@
                 "  Coordinates: 0.0, 0.0\n" +
                 "  Coordinates (projected): 0.0, -7.081154551613622E-10\n" +
-                "\n", InspectPrimitiveDialog.buildDataText(layer, new ArrayList<>(ds.allPrimitives())));
+                "\n", InspectPrimitiveDialog.buildDataText(ds, new ArrayList<>(ds.allPrimitives())));
     }