Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r54ed6c0d1b17e218d89fb5b1a4be658162e11609 -rbf5ca2e28c773376b41564c9e824fda2596d1b2e
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 54ed6c0d1b17e218d89fb5b1a4be658162e11609)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision bf5ca2e28c773376b41564c9e824fda2596d1b2e)
@@ -76,7 +76,13 @@
                                                                                                            validHrdFilePath);
             mockRepository.ReplayAll();
 
-            var calculation = new TestClosingStructuresCalculationScenario();
+            var calculation = new TestClosingStructuresCalculationScenario
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First()
+                }
+            };
 
             SetInvalidInputParameters(calculation.InputParameters, (RoundedDouble) value);
 
@@ -133,7 +139,8 @@
             {
                 InputParameters =
                 {
-                    InflowModelType = ClosingStructureInflowModelType.LowSill
+                    InflowModelType = ClosingStructureInflowModelType.LowSill,
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First()
                 }
             };
             SetInvalidInputParameters(calculation.InputParameters, (RoundedDouble) value);
@@ -192,7 +199,8 @@
             {
                 InputParameters =
                 {
-                    InflowModelType = ClosingStructureInflowModelType.FloodedCulvert
+                    InflowModelType = ClosingStructureInflowModelType.FloodedCulvert,
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First()
                 }
             };
             SetInvalidInputParameters(calculation.InputParameters, (RoundedDouble) value);
@@ -246,7 +254,8 @@
             {
                 InputParameters =
                 {
-                    InflowModelType = (ClosingStructureInflowModelType) 9001
+                    InflowModelType = (ClosingStructureInflowModelType) 9001,
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First()
                 }
             };
 
@@ -283,7 +292,7 @@
                 InputParameters =
                 {
                     InflowModelType = inflowModelType,
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(),
                     ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam, breakWaterHeight)),
                     UseBreakWater = true
                 }