Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r64f84fe98cafb36dab06516a92d7aff97405f0ea -r8f9a6a79ed708dadaecdecd9ba03c7b790c43317
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 8f9a6a79ed708dadaecdecd9ba03c7b790c43317)
@@ -559,6 +559,7 @@
             {
                 HydraulicBoundaryData =
                 {
+                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -r64f84fe98cafb36dab06516a92d7aff97405f0ea -r8f9a6a79ed708dadaecdecd9ba03c7b790c43317
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 8f9a6a79ed708dadaecdecd9ba03c7b790c43317)
@@ -384,18 +384,20 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
+                var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0);
+                
                 var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01)
                 {
                     DuneLocationCalculations =
                     {
-                        new DuneLocationCalculation(new DuneLocation(locationName1, new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0), new DuneLocation.ConstructionProperties
+                        new DuneLocationCalculation(new DuneLocation(locationName1, hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
                         {
                             CoastalAreaId = 0,
                             Offset = 0,
                             Orientation = 0,
                             D50 = 0.000007
                         })),
-                        new DuneLocationCalculation(new DuneLocation(locationName2, new HydraulicBoundaryLocation(1300002, string.Empty, 0, 0), new DuneLocation.ConstructionProperties
+                        new DuneLocationCalculation(new DuneLocation(locationName2, hydraulicBoundaryLocation, new DuneLocation.ConstructionProperties
                         {
                             CoastalAreaId = 0,
                             Offset = 0,
@@ -414,6 +416,17 @@
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
                     }
                 };
 
@@ -516,6 +529,7 @@
 
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
+                FilePath = validHrdFilePath,
                 HydraulicLocationConfigurationDatabase =
                 {
                     FilePath = validHlcdFilePath,
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r64f84fe98cafb36dab06516a92d7aff97405f0ea -r8f9a6a79ed708dadaecdecd9ba03c7b790c43317
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8f9a6a79ed708dadaecdecd9ba03c7b790c43317)
@@ -269,6 +269,7 @@
             {
                 HydraulicBoundaryData =
                 {
+                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath