Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java	(revision 15497)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java	(revision 15502)
@@ -114,5 +114,5 @@
 
     /**
-     * Test method for {@link GpxData#getTracks()},  {@link GpxData#addTrack(GpxTrack)},  {@link GpxData#removeTrack(GpxTrack)}.
+     * Test method for {@link GpxData#getTracks()},  {@link GpxData#addTrack(IGpxTrack)},  {@link GpxData#removeTrack(IGpxTrack)}.
      */
     @Test
@@ -136,5 +136,5 @@
 
     /**
-     * Test method for {@link GpxData#addTrack(GpxTrack)}.
+     * Test method for {@link GpxData#addTrack(IGpxTrack)}.
      */
     @Test(expected = IllegalArgumentException.class)
@@ -146,5 +146,5 @@
 
     /**
-     * Test method for {@link GpxData#removeTrack(GpxTrack)}.
+     * Test method for {@link GpxData#removeTrack(IGpxTrack)}.
      */
     @Test(expected = IllegalArgumentException.class)
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 15497)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 15502)
@@ -23,5 +23,5 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -240,5 +240,5 @@
         // Check that track is correct
         assertEquals(1, gpx.getTrackCount());
-        GpxTrack track = gpx.getTracks().iterator().next();
+        IGpxTrack track = gpx.getTracks().iterator().next();
         Collection<IGpxTrackSegment> segments = track.getSegments();
         assertEquals(1, segments.size());
Index: trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java	(revision 15497)
+++ trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java	(revision 15502)
@@ -24,5 +24,5 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -95,6 +95,6 @@
         assertEquals(1, gpx.tracks.size());
         assertEquals(1, in.data.tracks.size());
-        GpxTrack gpxTrack = gpx.tracks.iterator().next();
-        GpxTrack nmeaTrack = in.data.tracks.iterator().next();
+        IGpxTrack gpxTrack = gpx.tracks.iterator().next();
+        IGpxTrack nmeaTrack = in.data.tracks.iterator().next();
         assertEquals(gpxTrack.getBounds(), nmeaTrack.getBounds());
         int nTracks = gpxTrack.getSegments().size();