Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs
===================================================================
diff -u -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb -rea806dcdb54587994d490902a55cf4a680899090
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs	(.../LocationsViewSynchronizationTester.cs)	(revision ea806dcdb54587994d490902a55cf4a680899090)
@@ -146,6 +146,8 @@
         {
             // Given
             ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
+
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
@@ -161,6 +163,8 @@
         {
             // Given
             ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
+
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
@@ -176,6 +180,8 @@
         {
             // Given
             ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
+
             IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl();
             DataGridViewControl locationsDataGridViewControl = GetLocationsDataGridViewControl();
 
@@ -191,6 +197,8 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
+
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection locationsDataGridViewRows = locationsDataGridView.Rows;
             locationsDataGridView.CurrentCell = locationsDataGridViewRows[4].Cells[0];
@@ -230,6 +238,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
 
@@ -247,6 +256,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -270,6 +280,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -293,6 +304,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -316,6 +328,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -335,6 +348,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -361,6 +375,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
@@ -387,6 +402,7 @@
         {
             // Given
             LocationsView<T> view = ShowFullyConfiguredLocationsView(TestForm);
+            MockRepository.ReplayAll();
 
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             locationsDataGridView.CurrentCell = locationsDataGridView.Rows[4].Cells[0];
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb -rea806dcdb54587994d490902a55cf4a680899090
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision ea806dcdb54587994d490902a55cf4a680899090)
@@ -505,7 +505,9 @@
 
         protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
         {
-            return ShowFullyConfiguredDesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub(), form);
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+
+            return ShowFullyConfiguredDesignWaterLevelLocationsView(assessmentSection, form);
         }
 
         protected override void ReplaceHydraulicBoundaryDatabaseAndNotifyObservers(LocationsView<HydraulicBoundaryLocation> view)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb -rea806dcdb54587994d490902a55cf4a680899090
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision ea806dcdb54587994d490902a55cf4a680899090)
@@ -504,7 +504,9 @@
 
         protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
         {
-            return ShowFullyConfiguredWaveHeightLocationsView(new ObservableTestAssessmentSectionStub(), form);
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+
+            return ShowFullyConfiguredWaveHeightLocationsView(assessmentSection, form);
         }
 
         protected override void ReplaceHydraulicBoundaryDatabaseAndNotifyObservers(LocationsView<HydraulicBoundaryLocation> view)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb -rea806dcdb54587994d490902a55cf4a680899090
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision ea806dcdb54587994d490902a55cf4a680899090)
@@ -57,8 +57,12 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
+
             // Call
-            using (var view = new DesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub()))
+            using (var view = new DesignWaterLevelLocationsView(assessmentSection))
             {
                 // Assert
                 Assert.IsInstanceOf<HydraulicBoundaryLocationsView>(view);
@@ -69,9 +73,13 @@
         [Test]
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
-            // Setup & Call
-            ShowDesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub(), TestForm);
+            // Setup
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
+            // Call
+            ShowDesignWaterLevelLocationsView(assessmentSection, TestForm);
+
             // Assert
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             Assert.AreEqual(6, locationsDataGridView.ColumnCount);
@@ -318,13 +326,15 @@
             return view;
         }
 
-        private static DesignWaterLevelLocationsView ShowFullyConfiguredDesignWaterLevelLocationsView(Form form)
+        private DesignWaterLevelLocationsView ShowFullyConfiguredDesignWaterLevelLocationsView(Form form)
         {
-            var assessmentSection = new ObservableTestAssessmentSectionStub
-            {
-                HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
-            };
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase();
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(testHydraulicBoundaryDatabase);
+
+            MockRepository.ReplayAll();
+
             DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(assessmentSection, form);
 
             view.Data = assessmentSection.HydraulicBoundaryDatabase.Locations;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -rc4b2afb79467775209b1be1de2b2cc91a9fa2abb -rea806dcdb54587994d490902a55cf4a680899090
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision c4b2afb79467775209b1be1de2b2cc91a9fa2abb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision ea806dcdb54587994d490902a55cf4a680899090)
@@ -55,8 +55,12 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
+
             // Call
-            using (var view = new WaveHeightLocationsView(new ObservableTestAssessmentSectionStub()))
+            using (var view = new WaveHeightLocationsView(assessmentSection))
             {
                 // Assert
                 Assert.IsInstanceOf<HydraulicBoundaryLocationsView>(view);
@@ -67,9 +71,13 @@
         [Test]
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
-            // Setup & Call
-            ShowWaveHeightLocationsView(new ObservableTestAssessmentSectionStub(), TestForm);
+            // Setup
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            MockRepository.ReplayAll();
 
+            // Call
+            ShowWaveHeightLocationsView(assessmentSection, TestForm);
+
             // Assert
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             Assert.AreEqual(6, locationsDataGridView.ColumnCount);
@@ -310,13 +318,15 @@
             return view;
         }
 
-        private static WaveHeightLocationsView ShowFullyConfiguredWaveHeightLocationsView(Form form)
+        private WaveHeightLocationsView ShowFullyConfiguredWaveHeightLocationsView(Form form)
         {
-            var assessmentSection = new ObservableTestAssessmentSectionStub
-            {
-                HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
-            };
+            var assessmentSection = MockRepository.Stub<IAssessmentSection>();
+            var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase();
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(testHydraulicBoundaryDatabase);
+
+            MockRepository.ReplayAll();
+
             WaveHeightLocationsView view = ShowWaveHeightLocationsView(assessmentSection, form);
 
             view.Data = assessmentSection.HydraulicBoundaryDatabase.Locations;