Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs
===================================================================
diff -u -rbc8ae57e3325536794b6280c10aa25639cf9f565 -r12652870d19153635f4b59f04a244f1df288a3d4
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision bc8ae57e3325536794b6280c10aa25639cf9f565)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 12652870d19153635f4b59f04a244f1df288a3d4)
@@ -184,7 +184,7 @@
         public void Selection_Always_ReturnsDataContext()
         {
             // Setup
-            var mapData = new MapLineData("line data");
+            var mapData = new TestFeatureBasedMapData();
             var mapDataCollection = new MapDataCollection("collection");
 
             mapDataCollection.Add(mapData);
Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapDataCollectionPropertiesTest.cs
===================================================================
diff -u -re5e082fb262551f7f0883763d395563910a0b4cd -r12652870d19153635f4b59f04a244f1df288a3d4
--- Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapDataCollectionPropertiesTest.cs	(.../MapDataCollectionPropertiesTest.cs)	(revision e5e082fb262551f7f0883763d395563910a0b4cd)
+++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyClasses/MapDataCollectionPropertiesTest.cs	(.../MapDataCollectionPropertiesTest.cs)	(revision 12652870d19153635f4b59f04a244f1df288a3d4)
@@ -26,6 +26,7 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.TestUtil;
 using Core.Plugins.Map.PropertyClasses;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -65,7 +66,7 @@
         {
             // Setup
             var mapDataCollection = new MapDataCollection("Test");
-            mapDataCollection.Add(new MapPointData("Test 2"));
+            mapDataCollection.Add(new TestFeatureBasedMapData());
 
             // Call
             var properties = new MapDataCollectionProperties(mapDataCollection, Enumerable.Empty<MapDataCollection>());
@@ -148,9 +149,9 @@
             mocks.ReplayAll();
 
             var mapDataCollection = new MapDataCollection("Collection");
-            var childLayer1 = new MapLineData("Child 1");
-            var childCollection = new MapDataCollection("Child 2");
-            var childLayer2 = new MapLineData("Child 2");
+            var childLayer1 = new TestFeatureBasedMapData();
+            var childCollection = new MapDataCollection("Child");
+            var childLayer2 = new TestFeatureBasedMapData();
 
             mapDataCollection.Add(childLayer1);
             mapDataCollection.Add(childCollection);