Index: trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java	(revision 19491)
+++ trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java	(revision 19492)
@@ -74,8 +74,8 @@
             MainApplication.getLayerManager().addLayer(layer);
 
-            existingNode = createNode(5);
-            existingNode2 = createNode(6);
+            existingNode = createNode(5, layer);
+            existingNode2 = createNode(6, layer);
 
-            existingWay = createWay(10, existingNode, existingNode2);
+            existingWay = createWay(10, layer, existingNode, existingNode2);
         }
 
@@ -86,4 +86,8 @@
          */
         public Node createNode(long id) {
+            return createNode(id, layer);
+        }
+
+        public static Node createNode(long id, OsmDataLayer layer) {
             Node node = new Node();
             node.setOsmId(id, 1);
@@ -102,4 +106,8 @@
          */
         public Way createWay(int id, Node... nodes) {
+            return createWay(id, layer, nodes);
+        }
+
+        public static Way createWay(int id, OsmDataLayer layer, Node... nodes) {
             Way way = new Way();
             way.setOsmId(id, 1);
@@ -118,4 +126,8 @@
          */
         public Relation createRelation(int id, RelationMember... members) {
+            return createRelation(id, layer, members);
+        }
+        
+        public static Relation createRelation(int id, OsmDataLayer layer, RelationMember... members) {
             Relation relation = new Relation(id, 1);
             for (RelationMember member : members) {
@@ -143,5 +155,5 @@
          */
         public CommandTestDataWithRelation() {
-            existingRelation = createRelation(20, new RelationMember("node", existingNode), new RelationMember("way", existingWay));
+            existingRelation = createRelation(20, layer, new RelationMember("node", existingNode), new RelationMember("way", existingWay));
         }
     }