Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r8b4be0b8cc1526f6d22da4e11550ea7097d5dc4c -r2f91e8a3b388a9345269a2bd51efaf126a26bb63
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 8b4be0b8cc1526f6d22da4e11550ea7097d5dc4c)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 2f91e8a3b388a9345269a2bd51efaf126a26bb63)
@@ -468,7 +468,7 @@
                 // Call
                 Action call = () => guiService.CalculateWaveHeights(new[]
                                                                     {
-                                                                        new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(hydraulicLocationName))
+                                                                        new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
                                                                     },
                                                                     assessmentSection,
                                                                     0.01,
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r750a358260cb5c3d0115961d87dde72867a7df9d -r2f91e8a3b388a9345269a2bd51efaf126a26bb63
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 750a358260cb5c3d0115961d87dde72867a7df9d)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 2f91e8a3b388a9345269a2bd51efaf126a26bb63)
@@ -169,7 +169,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1)
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabases.First().Locations.First()
                 }
             };
 
@@ -265,7 +265,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabases.First().Locations.First(),
                     Structure = new TestHeightStructure()
                 }
             };
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r88c6992795b9abe99667ac5e93094aacd404c409 -r2f91e8a3b388a9345269a2bd51efaf126a26bb63
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 88c6992795b9abe99667ac5e93094aacd404c409)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 2f91e8a3b388a9345269a2bd51efaf126a26bb63)
@@ -170,7 +170,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabases.First().Locations.First(),
                     InflowModelType = StabilityPointStructureInflowModelType.LowSill,
                     LoadSchematizationType = LoadSchematizationType.Linear
                 }
@@ -272,7 +272,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabases.First().Locations.First(),
                     Structure = new TestStabilityPointStructure()
                 }
             };