Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u -r4c7e3ff3bf5c0a50fd9d208b71400e5dfb6cebd4 -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision 4c7e3ff3bf5c0a50fd9d208b71400e5dfb6cebd4)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -27,9 +27,9 @@
 using System.Linq;
 using Core.Common.TestUtil;
 using Core.Components.DotSpatial.Converter;
-using Core.Components.DotSpatial.TestUtil;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
+using Core.Components.Gis.TestUtil;
 using Core.Components.Gis.Theme;
 using DotSpatial.Controls;
 using DotSpatial.Data;
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/FeatureBasedMapDataLayerFactoryTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/FeatureBasedMapDataLayerFactoryTest.cs	(.../FeatureBasedMapDataLayerFactoryTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/FeatureBasedMapDataLayerFactoryTest.cs	(.../FeatureBasedMapDataLayerFactoryTest.cs)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -21,8 +21,8 @@
 
 using System;
 using Core.Components.DotSpatial.Layer;
-using Core.Components.DotSpatial.TestUtil;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.TestUtil;
 using NUnit.Framework;
 
 namespace Core.Components.DotSpatial.Test.Layer
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil.Test/Core.Components.DotSpatial.TestUtil.Test.csproj
===================================================================
diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.DotSpatial.TestUtil.Test/Core.Components.DotSpatial.TestUtil.Test.csproj	(.../Core.Components.DotSpatial.TestUtil.Test.csproj)	(revision 63fc151e9cf722527465c1eddfa6567a90feb5e6)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil.Test/Core.Components.DotSpatial.TestUtil.Test.csproj	(.../Core.Components.DotSpatial.TestUtil.Test.csproj)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -16,7 +16,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestFeatureBasedMapDataTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
Fisheye: Tag b1a9f7ec860ece4c2a9a488d1c1893bcc4590036 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.TestUtil.Test/TestFeatureBasedMapDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/Core.Components.DotSpatial.TestUtil.csproj
===================================================================
diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/Core.Components.DotSpatial.TestUtil.csproj	(.../Core.Components.DotSpatial.TestUtil.csproj)	(revision 63fc151e9cf722527465c1eddfa6567a90feb5e6)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/Core.Components.DotSpatial.TestUtil.csproj	(.../Core.Components.DotSpatial.TestUtil.csproj)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -12,7 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestFeatureBasedMapData.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Fisheye: Tag b1a9f7ec860ece4c2a9a488d1c1893bcc4590036 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.TestUtil/TestFeatureBasedMapData.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r3197a117a8f4b8726ef40fe31d88a34f4621a56c -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 3197a117a8f4b8726ef40fe31d88a34f4621a56c)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -16,6 +16,7 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TestFeatureBasedMapDataTest.cs" />
     <Compile Include="Theme\CategoryThemeTest.cs" />
     <Compile Include="Theme\ValueCriterionOperatorTest.cs" />
     <Compile Include="Theme\ValueCriterionTest.cs" />
Index: Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapDataConverterTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapDataConverterTest.cs	(.../RemovableMapDataConverterTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapDataConverterTest.cs	(.../RemovableMapDataConverterTest.cs)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -21,11 +21,11 @@
 
 using System;
 using System.Drawing;
-using Core.Components.DotSpatial.TestUtil;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Data.Removable;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Style;
+using Core.Components.Gis.TestUtil;
 using NUnit.Framework;
 
 namespace Core.Components.Gis.Test.Data.Removable
Index: Core/Components/test/Core.Components.Gis.Test/TestFeatureBasedMapDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/TestFeatureBasedMapDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/TestFeatureBasedMapDataTest.cs	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Components.Gis.Data;
+using Core.Components.Gis.TestUtil;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test
+{
+    [TestFixture]
+    public class TestFeatureBasedMapDataTest
+    {
+        [Test]
+        public void Constructor_ValidArguments_ExpectedValues()
+        {
+            // Setup
+            const string name = "A";
+
+            // Call
+            var mapData = new TestFeatureBasedMapData(name);
+
+            // Assert
+            Assert.IsInstanceOf<FeatureBasedMapData>(mapData);
+            Assert.AreEqual(name, mapData.Name);
+            CollectionAssert.IsEmpty(mapData.Features);
+            Assert.IsTrue(mapData.IsVisible);
+            CollectionAssert.IsEmpty(mapData.MetaData);
+            Assert.IsNull(mapData.SelectedMetaDataAttribute);
+            Assert.IsFalse(mapData.ShowLabels);
+            Assert.IsNull(mapData.MapTheme);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.TestUtil/Core.Components.Gis.TestUtil.csproj
===================================================================
diff -u -r7342ccce69e53838422f3fd9e96029d674ceacb4 -rb1a9f7ec860ece4c2a9a488d1c1893bcc4590036
--- Core/Components/test/Core.Components.Gis.TestUtil/Core.Components.Gis.TestUtil.csproj	(.../Core.Components.Gis.TestUtil.csproj)	(revision 7342ccce69e53838422f3fd9e96029d674ceacb4)
+++ Core/Components/test/Core.Components.Gis.TestUtil/Core.Components.Gis.TestUtil.csproj	(.../Core.Components.Gis.TestUtil.csproj)	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -14,6 +14,7 @@
   <ItemGroup>
     <Compile Include="CategoryThemeTestFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestFeatureBasedMapData.cs" />
     <Compile Include="TestImageBasedMapData.cs" />
     <Compile Include="WmtsMapDataTestHelper.cs" />
   </ItemGroup>
Index: Core/Components/test/Core.Components.Gis.TestUtil/TestFeatureBasedMapData.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.TestUtil/TestFeatureBasedMapData.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.TestUtil/TestFeatureBasedMapData.cs	(revision b1a9f7ec860ece4c2a9a488d1c1893bcc4590036)
@@ -0,0 +1,41 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Components.Gis.Data;
+
+namespace Core.Components.Gis.TestUtil
+{
+    /// <summary>
+    /// A class representing a <see cref="FeatureBasedMapData"/> implementation which is
+    /// not in the regular codebase.
+    /// </summary>
+    public class TestFeatureBasedMapData : FeatureBasedMapData
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="TestFeatureBasedMapData"/>.
+        /// </summary>
+        /// <param name="name">The name of the map data.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is
+        /// <c>null</c> or whitespace.</exception>
+        public TestFeatureBasedMapData(string name) : base(name) {}
+    }
+}
\ No newline at end of file