Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rf0e50ec187773ab3877c55e1dc6c7ea1f3bef5f0 -r0421ab7ca531e90a63739a2a2aeb0c5ea610bde3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision f0e50ec187773ab3877c55e1dc6c7ea1f3bef5f0)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 0421ab7ca531e90a63739a2a2aeb0c5ea610bde3)
@@ -297,11 +297,16 @@
         public void Run_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_ExpectedPreprocessorDirectorySetToCalculator()
         {
             // Setup
+            var calculation = new TestClosingStructuresCalculation();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 HydraulicBoundaryDatabase =
                 {
-                    FilePath = validFilePath
+                    FilePath = validFilePath,
+                    Locations =
+                    {
+                        calculation.InputParameters.HydraulicBoundaryLocation
+                    }
                 }
             };
             HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase);
@@ -313,14 +318,13 @@
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(new TestStructuresCalculator<StructuresClosureCalculationInput>());
             mockRepository.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new TestClosingStructuresCalculation();
 
             CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
                                                                                                                   failureMechanism,
@@ -340,6 +344,7 @@
         public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_ExpectedPreprocessorDirectorySetToCalculator()
         {
             // Setup
+            var calculation = new TestClosingStructuresCalculation();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 HydraulicBoundaryDatabase =
@@ -350,6 +355,10 @@
                         CanUsePreprocessor = true,
                         UsePreprocessor = true,
                         PreprocessorDirectory = validPreprocessorDirectory
+                    },
+                    Locations =
+                    {
+                        calculation.InputParameters.HydraulicBoundaryLocation
                     }
                 }
             };
@@ -362,14 +371,13 @@
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(new TestStructuresCalculator<StructuresClosureCalculationInput>());
             mockRepository.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new TestClosingStructuresCalculation();
 
             CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
                                                                                                                   failureMechanism,
@@ -389,6 +397,7 @@
         public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_ExpectedPreprocessorDirectorySetToCalculator()
         {
             // Setup
+            var calculation = new TestClosingStructuresCalculation();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 HydraulicBoundaryDatabase =
@@ -399,6 +408,10 @@
                         CanUsePreprocessor = true,
                         UsePreprocessor = false,
                         PreprocessorDirectory = "NonExistingPreprocessorDirectory"
+                    },
+                    Locations =
+                    {
+                        calculation.InputParameters.HydraulicBoundaryLocation
                     }
                 }
             };
@@ -411,14 +424,13 @@
                              .WhenCalled(invocation =>
                              {
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
-                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(new TestStructuresCalculator<StructuresClosureCalculationInput>());
             mockRepository.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new TestClosingStructuresCalculation();
 
             CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
                                                                                                                   failureMechanism,