Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -63,7 +63,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -109,38 +110,35 @@
 
             using (var view = new AssessmentSectionView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 // Call
                 view.Data = assessmentSection;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
         [Test]
         public void Data_SetToNull_MapDataCleared()
         {
             // Setup
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             using (var view = new AssessmentSectionView
             {
-                Data = new ObservableTestAssessmentSectionStub()
+                Data = assessmentSection
             })
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 // Precondition
-                Assert.AreEqual(2, mapControl.Data.Collection.Count());
+                Assert.AreEqual(2, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -261,7 +259,7 @@
                 AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {