Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r8a13717b89735c088d6bcdebb90d6bca7f800757
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 8a13717b89735c088d6bcdebb90d6bca7f800757)
@@ -1241,14 +1241,17 @@
             var mockRepository = new MockRepository();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
                 {
                     hydraulicBoundaryLocation
                 }
             };
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
+
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
             mockRepository.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
@@ -1291,8 +1294,6 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
-            mocks.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -1303,8 +1304,11 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 4)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mocks.ReplayAll();
+
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
             var calculation = new MacroStabilityInwardsCalculationScenario();
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
@@ -1328,6 +1332,9 @@
         public void GetSelectableHydraulicBoundaryLocations_WithLocationsAndSurfaceLine_ReturnLocationsSortedByDistanceThenById()
         {
             // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            var handler = mocks.Stub<IObservablePropertyChangeHandler>();
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -1341,10 +1348,8 @@
                 }
             };
 
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-            var handler = mocks.Stub<IObservablePropertyChangeHandler>();
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
             mocks.ReplayAll();
 
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
@@ -1380,13 +1385,10 @@
         [Test]
         public void GivenLocationAndReferencePoint_WhenUpdatingSurfaceLine_ThenUpdateSelectableBoundaryLocations()
         {
-            // Given          
+            // Given
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var observable = mocks.StrictMock<IObservable>();
-            observable.Expect(o => o.NotifyObservers());
-            mocks.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -1399,8 +1401,12 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 200)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            observable.Expect(o => o.NotifyObservers());
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mocks.ReplayAll();
+
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
 
             MacroStabilityInwardsSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -r8a13717b89735c088d6bcdebb90d6bca7f800757
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision db77ae03f93f27b25268dd9f62f0091a47fe22d8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 8a13717b89735c088d6bcdebb90d6bca7f800757)
@@ -1672,17 +1672,19 @@
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var handler = mockRepository.Stub<IObservablePropertyChangeHandler>();
-            mockRepository.ReplayAll();
-
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
-            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
                 {
                     hydraulicBoundaryLocation
                 }
             };
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mockRepository.ReplayAll();
+
             var failureMechanism = new PipingFailureMechanism();
 
             PipingStochasticSoilModel soilModel = ValidStochasticSoilModel(0.0, 4.0);
@@ -1723,8 +1725,6 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
-            mocks.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -1735,8 +1735,11 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 4)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mocks.ReplayAll();
+
             var failureMechanism = new PipingFailureMechanism();
             var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput);
             var context = new PipingInputContext(calculation.InputParameters, calculation,
@@ -1763,8 +1766,6 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var handler = mocks.Stub<IObservablePropertyChangeHandler>();
-            mocks.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -1777,8 +1778,11 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 200)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mocks.ReplayAll();
+
             var failureMechanism = new PipingFailureMechanism();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);
@@ -1816,9 +1820,6 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var observable = mocks.StrictMock<IObservable>();
-            observable.Expect(o => o.NotifyObservers());
-            mocks.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -1831,8 +1832,12 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 200)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            observable.Expect(o => o.NotifyObservers());
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mocks.ReplayAll();
+
             var failureMechanism = new PipingFailureMechanism();
 
             PipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0);