Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -r424e934ab7fcdef2661e3fee605423ee9fd1b489 -re2b40c9e08052a476113b2cb2492f60057e6e4e1
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 424e934ab7fcdef2661e3fee605423ee9fd1b489)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision e2b40c9e08052a476113b2cb2492f60057e6e4e1)
@@ -74,15 +74,14 @@
         {
             // Setup
             var view = new AssessmentSectionView();
-            var map = (MapControl) view.Controls[0];
 
             var assessmentSection = new TestAssessmentSection();
 
             // Call
             view.Data = assessmentSection;
 
             // Assert
-            MapDataCollection mapData = map.Data;
+            MapDataCollection mapData = view.Map.Data;
 
             Assert.AreEqual(2, mapData.List.Count);
 
@@ -102,7 +101,6 @@
         {
             // Setup
             var view = new AssessmentSectionView();
-            var map = (MapControl) view.Controls[0];
 
             var referenceLine = new ReferenceLine();
             referenceLine.SetGeometry(new[]
@@ -125,8 +123,8 @@
 
             // Assert
             Assert.AreSame(assessmentSection, view.Data);
-            Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            MapDataCollection mapData = map.Data;
+            Assert.IsInstanceOf<MapDataCollection>(view.Map.Data);
+            MapDataCollection mapData = view.Map.Data;
             Assert.IsNotNull(mapData);
 
             var hrLocationsMapData = (MapPointData) mapData.List[0];
@@ -145,7 +143,6 @@
         {
             // Setup
             var view = new AssessmentSectionView();
-            var map = (MapControl) view.Controls[0];
 
             var assessmentSection = new TestAssessmentSection
             {
@@ -154,7 +151,7 @@
             assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0));
 
             view.Data = assessmentSection;
-            var mapData = map.Data;
+            var mapData = view.Map.Data;
 
             var mapDataElementBeforeUpdate = (MapPointData) mapData.List.First();
             var geometryBeforeUpdate = mapDataElementBeforeUpdate.Features.First().MapGeometries.First().PointCollections.First();
@@ -169,11 +166,11 @@
             assessmentSection.NotifyObservers();
 
             // Assert
-            Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            Assert.AreEqual(mapData, map.Data);
-            CollectionAssert.AreEquivalent(mapData.List, map.Data.List);
+            Assert.IsInstanceOf<MapDataCollection>(view.Map.Data);
+            Assert.AreEqual(mapData, view.Map.Data);
+            CollectionAssert.AreEquivalent(mapData.List, view.Map.Data.List);
 
-            var mapDataElementAfterUpdate = (MapPointData) map.Data.List.First();
+            var mapDataElementAfterUpdate = (MapPointData)view.Map.Data.List.First();
             var geometryAfterUpdate = mapDataElementAfterUpdate.Features.First().MapGeometries.First().PointCollections.First();
 
             Assert.AreEqual(new Point2D(2.0, 3.0), geometryAfterUpdate.First());
@@ -184,7 +181,6 @@
         {
             // Setup
             var view = new AssessmentSectionView();
-            var map = (MapControl) view.Controls[0];
 
             var points = new List<Point2D>
             {
@@ -205,7 +201,7 @@
             assessmentSection.ReferenceLine.SetGeometry(points);
 
             view.Data = assessmentSection;
-            var mapData = map.Data;
+            var mapData = view.Map.Data;
 
             var mapDataElementBeforeUpdate = (MapLineData) mapData.List.ElementAt(1);
             var geometryBeforeUpdate = mapDataElementBeforeUpdate.Features.First().MapGeometries.First().PointCollections.First();
@@ -220,11 +216,11 @@
             assessmentSection.NotifyObservers();
 
             // Assert
-            Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            Assert.AreEqual(mapData, map.Data);
-            CollectionAssert.AreEquivalent(mapData.List, map.Data.List);
+            Assert.IsInstanceOf<MapDataCollection>(view.Map.Data);
+            Assert.AreEqual(mapData, view.Map.Data);
+            CollectionAssert.AreEquivalent(mapData.List, view.Map.Data.List);
 
-            var mapDataElementAfterUpdate = (MapLineData) map.Data.List.ElementAt(1);
+            var mapDataElementAfterUpdate = (MapLineData)view.Map.Data.List.ElementAt(1);
             var geometryAfterUpdate = mapDataElementAfterUpdate.Features.First().MapGeometries.First().PointCollections.First();
 
             CollectionAssert.AreEquivalent(geometryAfterUpdate, pointsUpdate);
@@ -235,7 +231,6 @@
         {
             // Setup
             var view = new AssessmentSectionView();
-            var map = (MapControl) view.Controls[0];
 
             var assessmentSection = new TestAssessmentSection
             {
@@ -268,15 +263,14 @@
 
             // Assert
             Assert.AreEqual(assessmentSection, view.Data);
-            Assert.IsInstanceOf<MapDataCollection>(map.Data);
+            Assert.IsInstanceOf<MapDataCollection>(view.Map.Data);
         }
 
         [Test]
         public void Data_SetToNull_MapDataCleared()
         {
             // Setup
             var view = new AssessmentSectionView();
-            var map = (MapControl) view.Controls[0];
 
             var assessmentSection = new TestAssessmentSection
             {