Fisheye: Tag 35fa216f8255ce431cd920b991297fa80592b64a refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/BackgroundDataTestDataGeneratorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj
===================================================================
diff -u -r7071a71d08d7bd205f608b10100665481b94c27a -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj	(.../Ringtoets.Common.Data.TestUtil.Test.csproj)	(revision 7071a71d08d7bd205f608b10100665481b94c27a)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj	(.../Ringtoets.Common.Data.TestUtil.Test.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -54,7 +54,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="AssessmentSectionHelperTest.cs" />
-    <Compile Include="BackgroundDataTestDataGeneratorTest.cs" />
     <Compile Include="LimitedPrecisionHelperTest.cs" />
     <Compile Include="ObservableTestAssessmentSectionStubTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -80,14 +79,6 @@
       <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Fisheye: Tag 35fa216f8255ce431cd920b991297fa80592b64a refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj
===================================================================
diff -u -r92be34a088da8406be8d0cb37aa19b2462acebe0 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj	(.../Ringtoets.Common.Data.TestUtil.csproj)	(revision 92be34a088da8406be8d0cb37aa19b2462acebe0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj	(.../Ringtoets.Common.Data.TestUtil.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -54,7 +54,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="AssessmentSectionHelper.cs" />
-    <Compile Include="BackgroundDataTestDataGenerator.cs" />
     <Compile Include="BackgroundDataTestHelper.cs" />
     <Compile Include="CalculationType.cs" />
     <Compile Include="LimitedPrecisionHelper.cs" />
@@ -82,14 +81,6 @@
       <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rdd2a51d0a110b707de32cca2b00994f33f877c9c -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision dd2a51d0a110b707de32cca2b00994f33f877c9c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -196,6 +196,10 @@
       <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
       <Name>Ringtoets.Common.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.Common.Utils\Ringtoets.Common.Utils.csproj">
+      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
+      <Name>Ringtoets.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs	(.../RingtoetsBackgroundMapDataFactoryTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsBackgroundMapDataFactoryTest.cs	(.../RingtoetsBackgroundMapDataFactoryTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -26,9 +26,9 @@
 using Core.Components.Gis.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Utils.TypeConverters;
 
 namespace Ringtoets.Common.Forms.Test.Views
 {
@@ -62,7 +62,7 @@
         public void CreateBackgroundMapData_WmtsConfiguredBackgroundData_ReturnWmtsMapData(WmtsMapData mapData)
         {
             // Setup
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             // Call
             ImageBasedMapData backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
@@ -76,8 +76,8 @@
         {
             // Setup
             var random = new Random(21);
-            var wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
+            var wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(new WellKnownTileSourceMapData(wellKnownTileSource));
 
             // Call
             ImageBasedMapData backgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -37,9 +37,9 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Utils.TypeConverters;
 
 namespace Ringtoets.Common.Forms.Test.Views
 {
@@ -53,12 +53,12 @@
         {
             get
             {
-                yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource.BingAerial),
-                                              BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData()))
+                yield return new TestCaseData(BackgroundDataConverter.ConvertTo(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)),
+                                              BackgroundDataConverter.ConvertTo(WmtsMapData.CreateDefaultPdokMapData()))
                     .SetName("WellKnownToWmts");
 
-                yield return new TestCaseData(BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(WmtsMapData.CreateDefaultPdokMapData()),
-                                              BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource.BingAerial))
+                yield return new TestCaseData(BackgroundDataConverter.ConvertTo(WmtsMapData.CreateDefaultPdokMapData()),
+                                              BackgroundDataConverter.ConvertTo(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial)))
                     .SetName("WmtsToWellKnown");
             }
         }
@@ -123,7 +123,7 @@
         {
             // Setup
             WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             var control = new RingtoetsMapControl();
 
@@ -145,7 +145,7 @@
         {
             // Given
             WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
@@ -180,8 +180,8 @@
             var testWellKnownTileSource = new TestWellKnownTileSource(new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial));
 
             string sourceCapabilitiesUrl = originalBackgroundData.Configuration is WmtsBackgroundDataConfiguration
-                                               ? ((WmtsBackgroundDataConfiguration)originalBackgroundData.Configuration).SourceCapabilitiesUrl
-                                               : ((WmtsBackgroundDataConfiguration)newBackgroundData.Configuration).SourceCapabilitiesUrl;
+                                               ? ((WmtsBackgroundDataConfiguration) originalBackgroundData.Configuration).SourceCapabilitiesUrl
+                                               : ((WmtsBackgroundDataConfiguration) newBackgroundData.Configuration).SourceCapabilitiesUrl;
 
             tileSourceFactory.Expect(tsf => tsf.GetWmtsTileSources(sourceCapabilitiesUrl))
                              .Return(Enumerable.Empty<ITileSource>());
@@ -225,7 +225,7 @@
             mocks.ReplayAll();
 
             WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
@@ -260,7 +260,7 @@
             mocks.ReplayAll();
 
             WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
@@ -298,9 +298,8 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            const RingtoetsWellKnownTileSource wellKnownTileSource = RingtoetsWellKnownTileSource.BingAerial;
             var mapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial);
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs	(.../MapDataTestHelperTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs	(.../MapDataTestHelperTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -1116,34 +1116,10 @@
             TestDelegate test = () => MapDataTestHelper.AssertImageBasedMapData(new BackgroundData(new TestBackgroundDataConfiguration()), imageBasedMapData);
 
             // Assert
-            Assert.Throws<AssertionException>(test);
+            Assert.Throws<AssertionException>(test, "Unsupported background configuration.");
         }
 
         [Test]
-        public void AssertImageBasedMapData_BackgroundDataNull_ThrowAssertionException()
-        {
-            // Setup
-            var imageBasedMapData = new SimpleImageBasedMapData();
-
-            // Call
-            TestDelegate test = () => MapDataTestHelper.AssertImageBasedMapData(null, imageBasedMapData);
-
-            // Assert
-            Assert.Throws<AssertionException>(test);
-        }
-
-        [Test]
-        public void AssertImageBasedMapData_DataNull_ThrowAssertionException()
-        {
-            // Call
-            TestDelegate test = () => MapDataTestHelper.AssertImageBasedMapData(BackgroundDataConverter.ConvertTo(WmtsMapData.CreateUnconnectedMapData()),
-                                                                                null);
-
-            // Assert
-            Assert.Throws<AssertionException>(test);
-        }
-
-        [Test]
         [TestCaseSource(nameof(NotEqualToDefaultPdokMapData))]
         public void AssertImageBasedMapData_WmtsMapDataNotEqual_ThrowAssertionException(WmtsMapData wmtsMapData)
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj	(.../Ringtoets.Common.Forms.TestUtil.Test.csproj)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj	(.../Ringtoets.Common.Forms.TestUtil.Test.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -44,7 +44,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs	(.../MapDataTestHelper.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs	(.../MapDataTestHelper.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -46,10 +46,10 @@
         /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="mapData"/> is not <see cref="MapLineData"/>.</item>
-        /// <item>The name of the <see cref="MapData"/> is not <c>"Vakindeling"</c>.</item>
-        /// <item>The number of sections and features in <see cref="MapData"/> are not the same.</item>
-        /// <item>The points of a section and the geometry of a corresponding feature are not the same.</item>        
+        /// <item><paramref name="mapData"/> is not <see cref="MapLineData"/>;</item>
+        /// <item>the name of the <see cref="MapData"/> is not <c>"Vakindeling"</c>;</item>
+        /// <item>the number of sections and features in <see cref="MapData"/> are not the same;</item>
+        /// <item>the points of a section and the geometry of a corresponding feature are not the same.</item>
         /// </list>
         /// </exception>
         public static void AssertFailureMechanismSectionsMapData(IEnumerable<FailureMechanismSection> sections, MapData mapData)
@@ -77,11 +77,11 @@
         /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="mapData"/> is not <see cref="MapPointData"/>.</item>
-        /// <item>The name of the <see cref="MapData"/> is not <c>"Hydraulische randvoorwaarden"</c>.</item>
-        /// <item><paramref name="mapData"/> has features when <paramref name="hydraulicBoundaryLocations"/> is <c>null</c>.</item>
-        /// <item>The number of hydraulic boundary locations and features in <see cref="MapData"/> are not the same.</item>
-        /// <item>The point of a hydraulic boundary location and the geometry of a corresponding feature are not the same.</item>        
+        /// <item><paramref name="mapData"/> is not <see cref="MapPointData"/>;</item>
+        /// <item>the name of the <see cref="MapData"/> is not <c>"Hydraulische randvoorwaarden"</c>;</item>
+        /// <item><paramref name="mapData"/> has features when <paramref name="hydraulicBoundaryLocations"/> is <c>null</c>;</item>
+        /// <item>the number of hydraulic boundary locations and features in <see cref="MapData"/> are not the same;</item>
+        /// <item>the point of a hydraulic boundary location and the geometry of a corresponding feature are not the same.</item>
         /// </list>
         /// </exception>
         public static void AssertHydraulicBoundaryLocationsMapData(IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations, MapData mapData)
@@ -111,11 +111,11 @@
         /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="mapData"/> is not <see cref="MapLineData"/>.</item>
-        /// <item>The name of the <see cref="MapData"/> is not <c>"Referentielijn"</c>.</item>
-        /// <item><paramref name="mapData"/> has features when <paramref name="referenceLine"/> is <c>null</c>.</item>
-        /// <item><paramref name="mapData"/> has more than one feature.</item>
-        /// <item>The points of the reference line and the geometry of the first feature are not the same.</item>
+        /// <item><paramref name="mapData"/> is not <see cref="MapLineData"/>;</item>
+        /// <item>the name of the <see cref="MapData"/> is not <c>"Referentielijn"</c>;</item>
+        /// <item><paramref name="mapData"/> has features when <paramref name="referenceLine"/> is <c>null</c>;</item>
+        /// <item><paramref name="mapData"/> has more than one feature;</item>
+        /// <item>the points of the reference line and the geometry of the first feature are not the same.</item>
         /// </list>
         /// </exception>
         public static void AssertReferenceLineMapData(ReferenceLine referenceLine, MapData mapData)
@@ -142,10 +142,10 @@
         /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="mapData"/> is not <see cref="MapPointData"/>.</item>
-        /// <item>The name of the <see cref="MapData"/> is not <c>"Vakindeling (startpunten)"</c>.</item>
-        /// <item><paramref name="mapData"/> has more than one feature.</item>
-        /// <item>The start points of the sections and the geometry of the first feature are not the same.</item>
+        /// <item><paramref name="mapData"/> is not <see cref="MapPointData"/>;</item>
+        /// <item>the name of the <see cref="MapData"/> is not <c>"Vakindeling (startpunten)"</c>;</item>
+        /// <item><paramref name="mapData"/> has more than one feature;</item>
+        /// <item>the start points of the sections and the geometry of the first feature are not the same.</item>
         /// </list>
         /// </exception>
         public static void AssertFailureMechanismSectionsStartPointMapData(IEnumerable<FailureMechanismSection> sections, MapData mapData)
@@ -165,10 +165,10 @@
         /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="mapData"/> is not <see cref="MapPointData"/>.</item>
-        /// <item>The name of the <see cref="MapData"/> is not <c>"Vakindeling (eindpunten)"</c>.</item>
-        /// <item><paramref name="mapData"/> has more than one feature.</item>
-        /// <item>The end points of the sections and the geometry of the first feature are not the same.</item>
+        /// <item><paramref name="mapData"/> is not <see cref="MapPointData"/>;</item>
+        /// <item>the name of the <see cref="MapData"/> is not <c>"Vakindeling (eindpunten)"</c>;</item>
+        /// <item><paramref name="mapData"/> has more than one feature;</item>
+        /// <item>the end points of the sections and the geometry of the first feature are not the same.</item>
         /// </list>
         /// </exception>
         public static void AssertFailureMechanismSectionsEndPointMapData(IEnumerable<FailureMechanismSection> sections, MapData mapData)
@@ -188,10 +188,10 @@
         /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="mapData"/> is not <see cref="MapLineData"/>.</item>
-        /// <item>The name of the <see cref="MapData"/> is not <c>Voorlandprofielen</c>.</item>
-        /// <item>The amount of features in <paramref name="mapData"/> is not equal to the length of the <paramref name="foreshoreProfiles"/>.</item>
-        /// <item>The geometries of the features in <paramref name="mapData"/> are not equal to the expected geometry of the <paramref name="foreshoreProfiles"/>.</item>
+        /// <item><paramref name="mapData"/> is not <see cref="MapLineData"/>;</item>
+        /// <item>the name of the <see cref="MapData"/> is not <c>Voorlandprofielen</c>;</item>
+        /// <item>the amount of features in <paramref name="mapData"/> is not equal to the length of the <paramref name="foreshoreProfiles"/>;</item>
+        /// <item>the geometries of the features in <paramref name="mapData"/> are not equal to the expected geometry of the <paramref name="foreshoreProfiles"/>.</item>
         /// </list>
         /// </exception>
         public static void AssertForeshoreProfilesMapData(IEnumerable<ForeshoreProfile> foreshoreProfiles, MapData mapData)
@@ -219,14 +219,12 @@
         /// <param name="imageBasedMapData">The <see cref="ImageBasedMapData"/> that needs to be asserted.</param>
         /// <exception cref="AssertionException">Thrown when:
         /// <list type="bullet">
-        /// <item><paramref name="imageBasedMapData"/> is not of the expected type.</item>
-        /// <item>One of the properties of <paramref name="imageBasedMapData"/> is not equal to <paramref name="backgroundData"/>.</item>
+        /// <item><paramref name="imageBasedMapData"/> is not of the expected type;</item>
+        /// <item>one of the properties of <paramref name="imageBasedMapData"/> is not equal to <paramref name="backgroundData"/>.</item>
         /// </list>
         /// </exception>
         public static void AssertImageBasedMapData(BackgroundData backgroundData, ImageBasedMapData imageBasedMapData)
         {
-            Assert.IsNotNull(backgroundData);
-            Assert.IsNotNull(imageBasedMapData);
             Assert.AreEqual(backgroundData.Name, imageBasedMapData.Name);
             Assert.AreEqual(backgroundData.IsVisible, imageBasedMapData.IsVisible);
             Assert.AreEqual(backgroundData.Transparency, imageBasedMapData.Transparency);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj
===================================================================
diff -u -r69e449c598057dc5d4703b95ab5c151a76a9cdbf -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision 69e449c598057dc5d4703b95ab5c151a76a9cdbf)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/Ringtoets.Common.Forms.TestUtil.csproj	(.../Ringtoets.Common.Forms.TestUtil.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -44,7 +44,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs	(.../BackgroundDataConverterTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs	(.../BackgroundDataConverterTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -150,7 +150,7 @@
         public void ConvertFrom_BackgroundData_ReturnWmtsMapData(WmtsMapData mapData)
         {
             // Setup
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             // Call
             ImageBasedMapData convertedMapData = BackgroundDataConverter.ConvertFrom(backgroundData);
@@ -164,8 +164,8 @@
         {
             // Setup
             var random = new Random(21);
-            var wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
+            var wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(new WellKnownTileSourceMapData(wellKnownTileSource));
 
             // Call
             ImageBasedMapData convertedMapData = BackgroundDataConverter.ConvertFrom(backgroundData);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r7dcf169799c42e16f0badadb62624806c4f7fb00 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 7dcf169799c42e16f0badadb62624806c4f7fb00)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -204,6 +204,10 @@
       <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
       <Name>Ringtoets.Common.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Utils\Ringtoets.Common.Utils.csproj">
+      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
+      <Name>Ringtoets.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs
===================================================================
diff -u -r0631da0684dd736f5ca061237ea606314f272366 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision 0631da0684dd736f5ca061237ea606314f272366)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -42,6 +42,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Utils.TypeConverters;
 using Ringtoets.Integration.Forms;
 using Ringtoets.Integration.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -124,7 +125,7 @@
         {
             // Setup
             WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -143,7 +144,7 @@
         {
             // Setup
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -162,8 +163,8 @@
         {
             // Setup
             var random = new Random(21);
-            var wellKnownTileSource = random.NextEnumValue<RingtoetsWellKnownTileSource>();
-            BackgroundData backgroundMapData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(wellKnownTileSource);
+            var wellKnownTileSource = random.NextEnumValue<WellKnownTileSource>();
+            BackgroundData backgroundMapData = BackgroundDataConverter.ConvertTo(new WellKnownTileSourceMapData(wellKnownTileSource));
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -284,7 +285,7 @@
             backgroundDataObserver.Expect(o => o.UpdateObserver());
 
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
@@ -339,7 +340,7 @@
             var assessmentSectionObserver = mockRepository.StrictMock<IObserver>();
             var backgroundDataObserver = mockRepository.StrictMock<IObserver>();
 
-            BackgroundData backgroundMapData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData(RingtoetsWellKnownTileSource.BingHybrid);
+            BackgroundData backgroundMapData = BackgroundDataConverter.ConvertTo(new WellKnownTileSourceMapData(WellKnownTileSource.BingHybrid));
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
@@ -399,7 +400,7 @@
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
 
             WmtsMapData newMapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData newBackgroundMapdata = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(newMapData);
+            BackgroundData newBackgroundMapdata = BackgroundDataConverter.ConvertTo(newMapData);
 
             var assessmentSection = new ObservableTestAssessmentSectionStub();
 
@@ -463,7 +464,7 @@
 
             const WellKnownTileSource wellKnownTileSource = WellKnownTileSource.BingAerial;
             var newMapData = new WellKnownTileSourceMapData(wellKnownTileSource);
-            BackgroundData newBackgroundData = BackgroundDataTestDataGenerator.GetWellKnownBackgroundMapData((RingtoetsWellKnownTileSource) wellKnownTileSource);
+            BackgroundData newBackgroundData = BackgroundDataConverter.ConvertTo(newMapData);
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
@@ -524,10 +525,10 @@
             var backgroundDataObserver = mockRepository.StrictMock<IObserver>();
 
             WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData();
-            BackgroundData backgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(mapData);
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
 
             WmtsMapData newMapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData newBackgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(newMapData);
+            BackgroundData newBackgroundData = BackgroundDataConverter.ConvertTo(newMapData);
 
             using (new UseCustomSettingsHelper(new TestSettingsHelper
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -139,10 +139,6 @@
       <Project>{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}</Project>
       <Name>Core.Components.DotSpatial.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj">
-      <Project>{aa47e858-a2a7-470e-8b2d-c76ae8ed9ccd}</Project>
-      <Name>Core.Components.DotSpatial</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
       <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
       <Name>Core.Components.Gis.Forms</Name>
@@ -155,10 +151,6 @@
       <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
       <Name>Core.Components.BruTile.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.DotSpatial.TestUtil\Core.Components.DotSpatial.TestUtil.csproj">
-      <Project>{9b6f3987-eaf7-4733-80c1-3dcab44d87ae}</Project>
-      <Name>Core.Components.DotSpatial.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
@@ -167,6 +159,10 @@
       <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
       <Name>Ringtoets.Common.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Utils\Ringtoets.Common.Utils.csproj">
+      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
+      <Name>Ringtoets.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
       <Project>{4843d6e5-066f-4795-94f5-1d53932dd03c}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r35fa216f8255ce431cd920b991297fa80592b64a
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
@@ -37,6 +37,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
+using Ringtoets.Common.Utils.TypeConverters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -193,7 +194,7 @@
             WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
             var assessmentSection = new ObservableTestAssessmentSectionStub
             {
-                BackgroundData = BackgroundDataTestDataGenerator.GetWmtsBackgroundMapData(backgroundMapData)
+                BackgroundData = BackgroundDataConverter.ConvertTo(backgroundMapData)
             };
 
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))