Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rca5825018a4c61a51239c9e1c2882e264892d07e -r9aeb7cde3a634d9a5be0693418989b8ab5618382
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision ca5825018a4c61a51239c9e1c2882e264892d07e)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 9aeb7cde3a634d9a5be0693418989b8ab5618382)
@@ -305,6 +305,7 @@
             {
                 HydraulicBoundaryData =
                 {
+                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath,
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/CalculationsState/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -re33b13f53bea7b3e0e2d73ad30baa1e8ba7f2d33 -r9aeb7cde3a634d9a5be0693418989b8ab5618382
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/CalculationsState/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision e33b13f53bea7b3e0e2d73ad30baa1e8ba7f2d33)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/CalculationsState/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 9aeb7cde3a634d9a5be0693418989b8ab5618382)
@@ -428,6 +428,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9f094f237c75356e1ea9baf1d77428bc52e0dbdc -r9aeb7cde3a634d9a5be0693418989b8ab5618382
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9f094f237c75356e1ea9baf1d77428bc52e0dbdc)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9aeb7cde3a634d9a5be0693418989b8ab5618382)
@@ -1001,6 +1001,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -re6273d12dc0b94f39236988596bc3bb4985ba1e6 -r9aeb7cde3a634d9a5be0693418989b8ab5618382
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs)	(revision e6273d12dc0b94f39236988596bc3bb4985ba1e6)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 9aeb7cde3a634d9a5be0693418989b8ab5618382)
@@ -944,6 +944,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r9aeb7cde3a634d9a5be0693418989b8ab5618382
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision 9aeb7cde3a634d9a5be0693418989b8ab5618382)
@@ -102,21 +102,25 @@
                        };
         }
 
-        private static HydraulicBoundaryData GetHydraulicBoundaryData(string filePath, bool usePreprocessorClosure)
+        private static HydraulicBoundaryData GetHydraulicBoundaryData(string hrdFilePath, bool usePreprocessorClosure)
         {
-            var hydraulicBoundaryData = new HydraulicBoundaryData
+            var hydraulicBoundaryData = new HydraulicBoundaryData();
+
+            if (hrdFilePath != null)
             {
-                FilePath = filePath,
-                Locations =
+                hydraulicBoundaryData.FilePath = hrdFilePath;
+                hydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
                 {
-                    new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
-                }
-            };
+                    FilePath = hrdFilePath,
+                    Locations =
+                    {
+                        new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
+                    },
+                    UsePreprocessorClosure = usePreprocessorClosure
+                });
 
-            if (filePath != null)
-            {
                 HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
-                hydraulicLocationConfigurationDatabase.FilePath = Path.Combine(Path.GetDirectoryName(filePath), "hlcd.sqlite");
+                hydraulicLocationConfigurationDatabase.FilePath = Path.Combine(Path.GetDirectoryName(hrdFilePath), "hlcd.sqlite");
                 hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = usePreprocessorClosure;
             }