Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r737cd3675ab5bc1b6400e4a0b86ebd543eaee650 -r3014d0ced22c45300938639e7958ea0850485240
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 737cd3675ab5bc1b6400e4a0b86ebd543eaee650)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 3014d0ced22c45300938639e7958ea0850485240)
@@ -89,9 +89,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var mockRepository = new MockRepository();
-                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-                mockRepository.ReplayAll();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
@@ -101,8 +99,6 @@
 
                 // Assert
                 Assert.AreSame(failureMechanismContext, view.Data);
-
-                mockRepository.VerifyAll();
             }
         }
 
@@ -130,7 +126,10 @@
 
             IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub
             {
-                BackgroundMapData = backgroundMapData
+                BackgroundMapData =
+                {
+                    MapData = backgroundMapData
+                }
             };
 
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
@@ -153,9 +152,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var mockRepository = new MockRepository();
-                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-                mockRepository.ReplayAll();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
@@ -172,8 +169,6 @@
                 Assert.IsNull(view.Data);
                 Assert.IsNull(view.Map.Data);
                 Assert.IsNull(view.Map.BackgroundMapData);
-
-                mockRepository.VerifyAll();
             }
         }
 
@@ -183,9 +178,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var mockRepository = new MockRepository();
-                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-                mockRepository.ReplayAll();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
@@ -196,8 +189,6 @@
                 // Assert
                 Assert.AreSame(failureMechanismContext, view.Data);
                 AssertEmptyMapData(view.Map.Data);
-
-                mockRepository.VerifyAll();
             }
         }
 
@@ -232,11 +223,11 @@
                                               new Point2D(2.0, 1.0)
                                           });
 
-                var mockRepository = new MockRepository();
-                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-                assessmentSection.ReferenceLine = referenceLine;
-                mockRepository.ReplayAll();
+                var assessmentSection = new ObservableTestAssessmentSectionStub
+                {
+                    HydraulicBoundaryDatabase = hydraulicBoundaryDatabase,
+                    ReferenceLine = referenceLine
+                };
 
                 var calculationLocationA = new Point2D(1.2, 2.3);
                 var calculationLocationB = new Point2D(2.7, 2.0);
@@ -303,8 +294,6 @@
                 AssertCalculationsMapData(
                     failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>(),
                     mapDataList[calculationsIndex]);
-
-                mockRepository.VerifyAll();
             }
         }