Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r3022e290bc9001043605f5a972cd15250b0a6a0c
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs	(.../AssessmentSectionHelper.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionHelper.cs	(.../AssessmentSectionHelper.cs)	(revision 3022e290bc9001043605f5a972cd15250b0a6a0c)
@@ -82,6 +82,15 @@
                                                             failureMechanism
                                                         };
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = filePath,
+                Locations =
+                {
+                    new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
+                }
+            };
+
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.Id).Return("21");
             assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(
@@ -93,22 +102,10 @@
 
             if (addBoundaryDatabase)
             {
-                assessmentSection.HydraulicBoundaryDatabase = GetHydraulicBoundaryDatabase(filePath);
+                assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
             }
 
             return assessmentSection;
         }
-
-        private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase(string filePath = null)
-        {
-            return new HydraulicBoundaryDatabase
-            {
-                FilePath = filePath,
-                Locations =
-                {
-                    new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
-                }
-            };
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs
===================================================================
diff -u -r1bbf51443c907b5f202e80764fa05f2e7f842c04 -r3022e290bc9001043605f5a972cd15250b0a6a0c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs	(.../FailureMechanismItemContextBaseTest.cs)	(revision 1bbf51443c907b5f202e80764fa05f2e7f842c04)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs	(.../FailureMechanismItemContextBaseTest.cs)	(revision 3022e290bc9001043605f5a972cd15250b0a6a0c)
@@ -97,17 +97,22 @@
         public void AvailableHydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
-
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var observable = mockRepository.Stub<IObservable>();
             var failureMechanism = mockRepository.Stub<IFailureMechanism>();
-            mockRepository.ReplayAll();
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    new HydraulicBoundaryLocation(1, "name", 1.1, 2.2)
+                }
+            };
 
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
+            mockRepository.ReplayAll();
+
             var context = new SimpleFailureMechanismItemContext<IObservable, IFailureMechanism>(observable, failureMechanism, assessmentSection);
 
             // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3022e290bc9001043605f5a972cd15250b0a6a0c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision 3022e290bc9001043605f5a972cd15250b0a6a0c)
@@ -367,17 +367,19 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsStructure_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
-            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 calculation = new StructuresCalculation<SimpleStructureInput>
             {
                 InputParameters =
@@ -470,17 +472,19 @@
         public void GivenPropertiesWithStructureAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
             // Given
-            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 calculation = new StructuresCalculation<SimpleStructureInput>
             {
                 InputParameters =
@@ -521,8 +525,6 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsAndNoStructure_ReturnsLocationsSortedById()
         {
             // Setup
-            mockRepository.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -533,8 +535,11 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 4)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mockRepository.ReplayAll();
+
             var calculation = new StructuresCalculation<SimpleStructureInput>();
             var inputContext = new SimpleInputContext(calculation.InputParameters,
                                                       calculation,
@@ -566,8 +571,6 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsAndStructure_ReturnsLocationsSortByDistanceThenById()
         {
             // Setup
-            mockRepository.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -580,8 +583,11 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 200)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mockRepository.ReplayAll();
+
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
                 InputParameters =
@@ -622,8 +628,6 @@
         public void GivenLocationAndReferencePoint_WhenUpdatingStructure_ThenUpdateSelectableBoundaryLocations()
         {
             // Given
-            mockRepository.ReplayAll();
-
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -636,8 +640,11 @@
                     new HydraulicBoundaryLocation(2, "B", 0, 200)
                 }
             };
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            mockRepository.ReplayAll();
+
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
                 InputParameters =