Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/CalculationsState/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbc1a323d30a22ad6581cbb625f1a694b10381c48 -re1f00d1791514fc3578fb44fe3f436f73e1494fd
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/CalculationsState/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision bc1a323d30a22ad6581cbb625f1a694b10381c48)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/CalculationsState/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision e1f00d1791514fc3578fb44fe3f436f73e1494fd)
@@ -521,6 +521,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbc1a323d30a22ad6581cbb625f1a694b10381c48 -re1f00d1791514fc3578fb44fe3f436f73e1494fd
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision bc1a323d30a22ad6581cbb625f1a694b10381c48)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision e1f00d1791514fc3578fb44fe3f436f73e1494fd)
@@ -1128,6 +1128,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r24f1ef9e52a44c48b728af3280bc6fc6f1f202ee -re1f00d1791514fc3578fb44fe3f436f73e1494fd
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 24f1ef9e52a44c48b728af3280bc6fc6f1f202ee)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs)	(revision e1f00d1791514fc3578fb44fe3f436f73e1494fd)
@@ -1069,6 +1069,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs
===================================================================
diff -u -rb9df4bbd2cf0f590cf20a673af76578215888e75 -re1f00d1791514fc3578fb44fe3f436f73e1494fd
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs	(.../HeightStructuresCalculationActivityFactoryTest.cs)	(revision b9df4bbd2cf0f590cf20a673af76578215888e75)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs	(.../HeightStructuresCalculationActivityFactoryTest.cs)	(revision e1f00d1791514fc3578fb44fe3f436f73e1494fd)
@@ -114,7 +114,7 @@
                                                                                                            validHrdFilePath);
             mocks.ReplayAll();
 
-            StructuresCalculation<HeightStructuresInput> calculation = CreateValidCalculation();
+            StructuresCalculation<HeightStructuresInput> calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.GetLocations().First());
 
             // Call
             CalculatableActivity activity = HeightStructuresCalculationActivityFactory.CreateCalculationActivity(calculation,
@@ -190,8 +190,10 @@
                                                                                                            validHrdFilePath);
             mocks.ReplayAll();
 
-            StructuresCalculation<HeightStructuresInput> calculation1 = CreateValidCalculation();
-            StructuresCalculation<HeightStructuresInput> calculation2 = CreateValidCalculation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First();
+            
+            StructuresCalculation<HeightStructuresInput> calculation1 = CreateValidCalculation(hydraulicBoundaryLocation);
+            StructuresCalculation<HeightStructuresInput> calculation2 = CreateValidCalculation(hydraulicBoundaryLocation);
 
             var calculations = new CalculationGroup
             {
@@ -256,8 +258,10 @@
                                                                                                            validHrdFilePath);
             mocks.ReplayAll();
 
-            StructuresCalculation<HeightStructuresInput> calculation1 = CreateValidCalculation();
-            StructuresCalculation<HeightStructuresInput> calculation2 = CreateValidCalculation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First();
+            
+            StructuresCalculation<HeightStructuresInput> calculation1 = CreateValidCalculation(hydraulicBoundaryLocation);
+            StructuresCalculation<HeightStructuresInput> calculation2 = CreateValidCalculation(hydraulicBoundaryLocation);
 
             failureMechanism.CalculationsGroup.Children.AddRange(new[]
             {
@@ -279,13 +283,13 @@
             mocks.VerifyAll();
         }
 
-        private static StructuresCalculation<HeightStructuresInput> CreateValidCalculation()
+        private static StructuresCalculation<HeightStructuresInput> CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             return new TestHeightStructuresCalculationScenario
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2),
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     FailureProbabilityStructureWithErosion = new Random(39).NextDouble()
                 }
             };