Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 4580)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 4603)
@@ -2,4 +2,6 @@
 package org.openstreetmap.josm.data.osm.history;
 
+
+import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
@@ -8,6 +10,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-
-import static org.junit.Assert.*;
+import org.openstreetmap.josm.data.osm.User;
 
 public class HistoryNodeTest {
@@ -17,19 +18,18 @@
         Date d = new Date();
         HistoryNode node = new HistoryNode(
-                1,
-                2,
+                1l,
+                2l,
                 true,
-                "testuser",
-                3,
-                4,
+                User.createOsmUser(3, "testuser"),
+                4l,
                 d,
                 new LatLon(0,0)
-        );
+                );
 
         assertEquals(1, node.getId());
         assertEquals(2, node.getVersion());
         assertEquals(true, node.isVisible());
-        assertEquals("testuser", node.getUser());
-        assertEquals(3, node.getUid());
+        assertEquals("testuser", node.getUser().getName());
+        assertEquals(3, node.getUser().getId());
         assertEquals(4, node.getChangesetId());
         assertEquals(d, node.getTimestamp());
@@ -43,10 +43,9 @@
                 2,
                 true,
-                "testuser",
-                3,
+                User.createOsmUser(3, "testuser"),
                 4,
                 d,
                 new LatLon(0,0)
-        );
+                );
 
         assertEquals(OsmPrimitiveType.NODE, node.getType());
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 4580)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 4603)
@@ -10,4 +10,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.User;
 
 public class HistoryWayTest {
@@ -20,15 +21,14 @@
                 2,
                 true,
-                "testuser",
-                3,
+                User.createOsmUser(3, "testuser"),
                 4,
                 d
-        );
+                );
 
         assertEquals(1, way.getId());
         assertEquals(2, way.getVersion());
         assertEquals(true, way.isVisible());
-        assertEquals("testuser", way.getUser());
-        assertEquals(3, way.getUid());
+        assertEquals("testuser", way.getUser().getName());
+        assertEquals(3, way.getUser().getId());
         assertEquals(4, way.getChangesetId());
         assertEquals(d, way.getTimestamp());
@@ -44,9 +44,8 @@
                 2,
                 true,
-                "testuser",
-                3,
+                User.createOsmUser(3, "testuser"),
                 4,
                 d
-        );
+                );
 
         assertEquals(OsmPrimitiveType.WAY, way.getType());
@@ -60,9 +59,8 @@
                 2,
                 true,
-                "testuser",
-                3,
+                User.createOsmUser(3, "testuser"),
                 4,
                 d
-        );
+                );
 
         way.addNode(1);
@@ -88,9 +86,8 @@
                 2,
                 true,
-                "testuser",
-                3,
+                User.createOsmUser(3, "testuser"),
                 4,
                 d
-        );
+                );
 
         way.addNode(1);