Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -rf861839e975251253e2ffd7bc3f0a1839b85534e -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision f861839e975251253e2ffd7bc3f0a1839b85534e)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad)
@@ -303,6 +303,8 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsStructure_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -311,7 +313,6 @@
                     hydraulicBoundaryLocation
                 }
             };
-            mockRepository.ReplayAll();
 
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
@@ -395,6 +396,8 @@
         public void GivenPropertiesWithStructureAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
             // Given
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -403,7 +406,6 @@
                     hydraulicBoundaryLocation
                 }
             };
-            mockRepository.ReplayAll();
 
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
@@ -440,6 +442,8 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsAndNoStructure_ReturnsLocationsSortedById()
         {
             // Setup
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -452,8 +456,6 @@
             };
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            mockRepository.ReplayAll();
-
             var calculation = new StructuresCalculation<SimpleStructureInput>();
             var inputContext = new SimpleInputContext(calculation.InputParameters,
                                                       calculation,
@@ -480,6 +482,8 @@
         public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsAndStructure_ReturnsLocationsSortByDistanceThenById()
         {
             // Setup
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -494,8 +498,6 @@
             };
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            mockRepository.ReplayAll();
-
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
                 InputParameters =
@@ -531,6 +533,8 @@
         public void GivenLocationAndReferencePoint_WhenUpdatingStructure_ThenUpdateSelectableBoundaryLocations()
         {
             // Given
+            mockRepository.ReplayAll();
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -544,7 +548,6 @@
                 }
             };
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-            mockRepository.ReplayAll();
 
             var calculation = new StructuresCalculation<SimpleStructureInput>
             {
@@ -768,7 +771,9 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            var customHandler = CreateCustomHandlerForCalculationReturningNoObservables<SimpleStructure>(calculation, null);
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+                CreateCustomHandlerForCalculationReturningNoObservables<SimpleStructure>(calculation, null);
+
             var properties = new SimpleStructuresInputProperties(
                 inputContext,
                 new StructuresInputBaseProperties<SimpleStructure, SimpleStructureInput, StructuresCalculation<SimpleStructureInput>, IFailureMechanism>.ConstructionProperties(),
@@ -797,7 +802,9 @@
                                                       assessmentSection);
 
             var newStructure = new SimpleStructure();
-            var customHandler = CreateCustomHandlerForCalculationReturningNoObservables(calculation, newStructure);
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
+                CreateCustomHandlerForCalculationReturningNoObservables(calculation, newStructure);
+
             var properties = new SimpleStructuresInputProperties(
                 inputContext,
                 new StructuresInputBaseProperties<SimpleStructure, SimpleStructureInput, StructuresCalculation<SimpleStructureInput>, IFailureMechanism>.ConstructionProperties(),
@@ -828,7 +835,7 @@
                                                       assessmentSection);
 
             string newStringValue = newValue.ToString(CultureInfo.InvariantCulture);
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler = 
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables(calculation, newStringValue);
 
             var properties = new SimpleStructuresInputProperties(
@@ -860,7 +867,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler = 
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables(calculation, newValue);
 
             var properties = new SimpleStructuresInputProperties(
@@ -890,7 +897,7 @@
                                                       failureMechanism,
                                                       assessmentSection);
 
-            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler = 
+            CalculationInputSetPropertyValueAfterConfirmationParameterTester customHandler =
                 CreateCustomHandlerForCalculationReturningNoObservables<string>(calculation, null);
 
             var properties = new SimpleStructuresInputProperties(
@@ -1035,9 +1042,9 @@
             input.ForeshoreProfile = new TestForeshoreProfile();
 
             var customHandler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new[]
-                {
-                    observable
-                });
+            {
+                observable
+            });
 
             var inputContext = new SimpleInputContext(input,
                                                       calculation,