Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r99361fa9b5ec36e0c6e3cfffe783786b31237c3b -rc050ab3fa60393232882c6adf34dd62f6ee01db4
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 99361fa9b5ec36e0c6e3cfffe783786b31237c3b)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision c050ab3fa60393232882c6adf34dd62f6ee01db4)
@@ -170,7 +170,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(),
                     InflowModelType = StabilityPointStructureInflowModelType.LowSill,
                     LoadSchematizationType = LoadSchematizationType.Linear
                 }
@@ -272,7 +272,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(),
                     Structure = new TestStabilityPointStructure()
                 }
             };
@@ -308,6 +308,7 @@
             {
                 HydraulicBoundaryData =
                 {
+                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath,
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9b0b5179e02bfb74013c54249d7907ca730761f4 -rc050ab3fa60393232882c6adf34dd62f6ee01db4
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9b0b5179e02bfb74013c54249d7907ca730761f4)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision c050ab3fa60393232882c6adf34dd62f6ee01db4)
@@ -1506,6 +1506,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r71a09fe242c37c9ce1b5bae3412457a2cde6c0db -rc050ab3fa60393232882c6adf34dd62f6ee01db4
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 71a09fe242c37c9ce1b5bae3412457a2cde6c0db)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs)	(revision c050ab3fa60393232882c6adf34dd62f6ee01db4)
@@ -927,6 +927,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r71a09fe242c37c9ce1b5bae3412457a2cde6c0db -rc050ab3fa60393232882c6adf34dd62f6ee01db4
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs)	(revision 71a09fe242c37c9ce1b5bae3412457a2cde6c0db)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs)	(revision c050ab3fa60393232882c6adf34dd62f6ee01db4)
@@ -463,6 +463,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath