Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rf9db544ad22552799aaaedc2a154abd8765f7099 -rd71d12fa277ebebb488ccc434cb59bed32c0755b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision f9db544ad22552799aaaedc2a154abd8765f7099)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
@@ -118,22 +118,23 @@
         }
 
         [Test]
-        public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet()
+        public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet()
         {
             // Setup
             IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub();
 
             using (var view = new HeightStructuresFailureMechanismView())
             {
+                var mapControl = (RingtoetsMapControl) view.Map;
+
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(assessmentSection.BackgroundData);
-                MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData);
+                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
             }
         }
 
@@ -143,6 +144,8 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
+                var mapControl = (RingtoetsMapControl)view.Map;
+
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
@@ -151,15 +154,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(8, view.Map.Data.Collection.Count());
+                Assert.AreEqual(8, mapControl.Data.Collection.Count());
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(view.Map.Data);
-                Assert.IsNull(view.Map.BackgroundMapData);
+                Assert.IsNull(mapControl.Data);
+                Assert.IsNull(mapControl.BackgroundData);
+                Assert.IsNull(mapControl.BackgroundMapData);
             }
         }
 
@@ -421,34 +425,8 @@
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
-
+        
         [Test]
-        public void GivenChangedBackgroundMapData_WhenBackgroundMapDataObserversNotified_MapDataUpdated()
-        {
-            // Given
-            using (var view = new HeightStructuresFailureMechanismView())
-            {
-                var assessmentSection = new ObservableTestAssessmentSectionStub();
-                view.Data = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSection);
-
-                BackgroundData backgroundData = assessmentSection.BackgroundData;
-
-                backgroundData.Name = "some Name";
-                backgroundData.Parameters[BackgroundDataIdentifiers.SourceCapabilitiesUrl] = "some URL";
-                backgroundData.Parameters[BackgroundDataIdentifiers.SelectedCapabilityIdentifier] = "some Identifier";
-                backgroundData.Parameters[BackgroundDataIdentifiers.PreferredFormat] = "image/some Format";
-                backgroundData.IsConfigured = true;
-
-                // When
-                backgroundData.NotifyObservers();
-
-                // Then
-                ImageBasedMapData expectedWmtsBackgroundMapData = RingtoetsBackgroundMapDataFactory.CreateBackgroundMapData(backgroundData);
-                MapDataTestHelper.AssertImageBasedMapData(expectedWmtsBackgroundMapData, view.Map.BackgroundMapData);
-            }
-        }
-
-        [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {
             // Setup