Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rd4dde608720153a015eb4e65c0d2d9e20b536e8d -r9d82d6b39110207a65b41ba33f79e365b301b099
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision d4dde608720153a015eb4e65c0d2d9e20b536e8d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 9d82d6b39110207a65b41ba33f79e365b301b099)
@@ -195,8 +195,12 @@
                 MapDataCollection mapData = view.Map.Data;
                 Assert.IsNotNull(mapData);
 
-                AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase);
-                AssertReferenceLineData(mapData, referenceLine);
+                MapData hydraulicBoundaryLocationsMapData = mapData.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
+                AssertHydraulicBoundarLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations,
+                                                       hydraulicBoundaryLocationsMapData);
+
+                MapData referenceLineMapData = mapData.Collection.ElementAt(referenceLineIndex);
+                AssertReferenceLineMapData(referenceLine, referenceLineMapData);
             }
         }
 
@@ -259,18 +263,19 @@
 
                 view.Data = assessmentSection;
                 MapDataCollection mapData = view.Map.Data;
+                MapData hydraulicBoundaryLocationsMapData = mapData.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
 
                 // Precondition
-                AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase);
+                AssertHydraulicBoundarLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations,
+                                                       hydraulicBoundaryLocationsMapData);
 
                 // When
-                assessmentSection.HydraulicBoundaryDatabase.Locations.Clear();
-                assessmentSection.HydraulicBoundaryDatabase.Locations.NotifyObservers();
                 assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "new 2", 2, 3));
                 assessmentSection.HydraulicBoundaryDatabase.Locations.NotifyObservers();
 
                 // Then
-                AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase);
+                AssertHydraulicBoundarLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations,
+                                                       hydraulicBoundaryLocationsMapData);
             }
         }
 
@@ -301,15 +306,17 @@
                 view.Data = assessmentSection;
                 MapDataCollection mapData = view.Map.Data;
 
+                MapData referenceLineMapData = mapData.Collection.ElementAt(referenceLineIndex);
+
                 // Precondition
-                AssertReferenceLineData(mapData, assessmentSection.ReferenceLine);
+                AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
 
                 // Call
                 assessmentSection.ReferenceLine.SetGeometry(pointsUpdate);
                 assessmentSection.NotifyObservers();
 
                 // Assert
-                AssertReferenceLineData(mapData, assessmentSection.ReferenceLine);
+                AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData);
             }
         }
 
@@ -405,20 +412,16 @@
             }
         }
 
-        private static void AssertHydraulicBoundaryDatabaseData(MapDataCollection mapData, HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
+        private static void AssertReferenceLineMapData(ReferenceLine referenceLine, MapData referenceLineMapData)
         {
-            var hrLocationsMapData = (MapPointData) mapData.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
-            CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations.Select(l => l.Location), hrLocationsMapData.Features.First().MapGeometries.First().PointCollections.First());
-            Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name);
-            Assert.IsTrue(hrLocationsMapData.IsVisible);
+            MapDataTestHelper.AssertReferenceLineMapData(referenceLine, referenceLineMapData);
+            Assert.IsTrue(referenceLineMapData.IsVisible);
         }
 
-        private static void AssertReferenceLineData(MapDataCollection mapData, ReferenceLine referenceLine)
+        private static void AssertHydraulicBoundarLocationsMapData(IEnumerable<HydraulicBoundaryLocation> locations, MapData hydraulicBoundaryLocationsMapData)
         {
-            var referenceLineMapData = (MapLineData) mapData.Collection.ElementAt(referenceLineIndex);
-            CollectionAssert.AreEqual(referenceLine.Points, referenceLineMapData.Features.First().MapGeometries.First().PointCollections.First());
-            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
-            Assert.IsTrue(referenceLineMapData.IsVisible);
+            MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(locations, hydraulicBoundaryLocationsMapData);
+            Assert.IsTrue(hydraulicBoundaryLocationsMapData.IsVisible);
         }
 
         private static void AssertEmptyMapData(MapDataCollection mapDataCollection)