Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rf5bef2b8699ba583616e0acefe4f21e7574026d4 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision f5bef2b8699ba583616e0acefe4f21e7574026d4)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -371,17 +371,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs
===================================================================
diff -u -r9aee56b8ad3609f1422f030db8147915755c781d -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs	(.../MapDataTestHelper.cs)	(revision 9aee56b8ad3609f1422f030db8147915755c781d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapDataTestHelper.cs	(.../MapDataTestHelper.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Geometry;
 using Core.Common.Util;
@@ -131,22 +130,6 @@
         }
 
         /// <summary>
-        /// Asserts whether the <see cref="MapData"/> contains the meta data that is representative for the <paramref name="referenceLine"/>.
-        /// </summary>
-        /// <param name="referenceLine">The reference line that contains the original data.</param>
-        /// <param name="assessmentSection">The assessment section that contains the original data.</param>
-        /// <param name="mapData">The <see cref="MapData"/> that needs to be asserted.</param>
-        /// <exception cref="AssertionException">Thrown when the meta data does not have the correct values.</exception>
-        public static void AssertReferenceLineMetaData(ReferenceLine referenceLine, IAssessmentSection assessmentSection, MapData mapData)
-        {
-            var referenceLineData = (MapLineData)mapData;
-            MapFeature feature = referenceLineData.Features.Single();
-            Assert.AreEqual(assessmentSection.Id, feature.MetaData["ID"]);
-            Assert.AreEqual(assessmentSection.Name, feature.MetaData["Naam"]);
-            Assert.AreEqual(new RoundedDouble(2, referenceLine.Length), feature.MetaData["Lengte*"]);
-        }
-
-        /// <summary>
         /// Asserts whether the <see cref="MapData"/> contains the data that is representative for the start points of the <paramref name="sections"/>.
         /// </summary>
         /// <param name="sections">The sections that contain the original data.</param>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs
===================================================================
diff -u -r6c65d8a1845a668be0982ce1d53f607a9766b1d0 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 6c65d8a1845a668be0982ce1d53f607a9766b1d0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -169,6 +169,21 @@
             }
         }
 
+        /// <summary>
+        /// Asserts whether the <paramref name="features"/> contains the meta data that is representative for the <paramref name="referenceLine"/>.
+        /// </summary>
+        /// <param name="referenceLine">The reference line that contains the original data.</param>
+        /// <param name="assessmentSection">The assessment section that contains the original data.</param>
+        /// <param name="features">The features that needs to be asserted.</param>
+        /// <exception cref="AssertionException">Thrown when the meta data does not have the correct values.</exception>
+        public static void AssertReferenceLineMetaData(ReferenceLine referenceLine, IAssessmentSection assessmentSection, IEnumerable<MapFeature> features)
+        {
+            MapFeature feature = features.Single();
+            Assert.AreEqual(assessmentSection.Id, feature.MetaData["ID"]);
+            Assert.AreEqual(assessmentSection.Name, feature.MetaData["Naam"]);
+            Assert.AreEqual(new RoundedDouble(2, referenceLine.Length), feature.MetaData["Lengte*"]);
+        }
+
         private static string GetExpectedResult(IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
                                                 HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs
===================================================================
diff -u -r5dbffebf9468b66213f97d4dcedbb35c168510f1 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision 5dbffebf9468b66213f97d4dcedbb35c168510f1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -342,17 +342,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r7c5e7284cc2bbec3c7121f25c6e2f4881460598c -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 7c5e7284cc2bbec3c7121f25c6e2f4881460598c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -362,22 +362,22 @@
             {
                 IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 var mocks = new MockRepository();
                 IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r90d8e1e70cfdeca4b20360203780e48ff162bc40 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 90d8e1e70cfdeca4b20360203780e48ff162bc40)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -396,17 +396,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r244093ebb23275088eefaf5e27c8eb7639561040 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 244093ebb23275088eefaf5e27c8eb7639561040)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -370,17 +370,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -r9aee56b8ad3609f1422f030db8147915755c781d -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 9aee56b8ad3609f1422f030db8147915755c781d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -227,18 +227,18 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
 
                 // Call
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Assert
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs
===================================================================
diff -u -r3b1bfb86e0bdf64c0e04b1c9397f6eb77834b3f6 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs	(.../FailureMechanismWithDetailedAssessmentViewTest.cs)	(revision 3b1bfb86e0bdf64c0e04b1c9397f6eb77834b3f6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs	(.../FailureMechanismWithDetailedAssessmentViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -441,17 +441,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // Call
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Assert
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismWithoutDetailedAssessmentViewTest.cs
===================================================================
diff -u -r3b1bfb86e0bdf64c0e04b1c9397f6eb77834b3f6 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismWithoutDetailedAssessmentViewTest.cs	(.../FailureMechanismWithoutDetailedAssessmentViewTest.cs)	(revision 3b1bfb86e0bdf64c0e04b1c9397f6eb77834b3f6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismWithoutDetailedAssessmentViewTest.cs	(.../FailureMechanismWithoutDetailedAssessmentViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -404,17 +404,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // Call
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Assert
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -reb62f34afa5651844f4941929c8c3d2b0a1546c1 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs	(.../MacroStabilityInwardsFailureMechanismViewTest.cs)	(revision eb62f34afa5651844f4941929c8c3d2b0a1546c1)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs	(.../MacroStabilityInwardsFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -386,17 +386,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r59998c7f4aa63c0fe87bfca0b3105584aea20205 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 59998c7f4aa63c0fe87bfca0b3105584aea20205)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -383,17 +383,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r35cca2064775b388d59ad924a16d5af684ae750a -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision 35cca2064775b388d59ad924a16d5af684ae750a)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -370,17 +370,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs
===================================================================
diff -u -r1a1b079e8edcb350c521213197bf88edf9bb18a7 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision 1a1b079e8edcb350c521213197bf88edf9bb18a7)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -364,17 +364,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs
===================================================================
diff -u -r2e78c2204be93bf68b60a1c061c381644b27f304 -r221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 2e78c2204be93bf68b60a1c061c381644b27f304)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 221beefb651cb287dbe3e0ee7fc3c8d3a7c81f40)
@@ -364,17 +364,17 @@
                 observers[referenceLineIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
-                MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex);
+                var referenceLineMapData = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex);
 
                 // Precondition
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
 
                 // When
                 assessmentSection.Name = "New name";
                 assessmentSection.NotifyObservers();
 
                 // Then
-                MapDataTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData);
+                MapFeaturesTestHelper.AssertReferenceLineMetaData(assessmentSection.ReferenceLine, assessmentSection, referenceLineMapData.Features);
                 mocks.VerifyAll();
             }
         }