Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r976640f418ae7996c54296d7a81bf1d3d034ff28 -r2e9f2a2a0997e4523699cceff1a5a201605709b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 976640f418ae7996c54296d7a81bf1d3d034ff28)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 2e9f2a2a0997e4523699cceff1a5a201605709b7)
@@ -570,6 +570,8 @@
         public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenLogMessagesAddedOutputSet()
         {
             // Given
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName");
+
             var mockRepository = new MockRepository();
             var assessmentSection = new AssessmentSectionStub
             {
@@ -579,11 +581,21 @@
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
                     }
                 }
             };
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName");
             assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
             {
                 hydraulicBoundaryLocation
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -r976640f418ae7996c54296d7a81bf1d3d034ff28 -r2e9f2a2a0997e4523699cceff1a5a201605709b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 976640f418ae7996c54296d7a81bf1d3d034ff28)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 2e9f2a2a0997e4523699cceff1a5a201605709b7)
@@ -646,6 +646,17 @@
                     {
                         FilePath = validHlcdFilePath,
                         UsePreprocessorClosure = usePreprocessorClosure
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
                     }
                 },
                 WaterLevelCalculationsForUserDefinedTargetProbabilities =
@@ -717,7 +728,8 @@
             const double targetProbability = 0.01;
             const string locationName = "locationName";
 
-            var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName));
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
+            var calculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
             var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability)
             {
                 HydraulicBoundaryLocationCalculations =
@@ -734,6 +746,17 @@
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
                     }
                 },
                 WaterLevelCalculationsForUserDefinedTargetProbabilities =
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r976640f418ae7996c54296d7a81bf1d3d034ff28 -r2e9f2a2a0997e4523699cceff1a5a201605709b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 976640f418ae7996c54296d7a81bf1d3d034ff28)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 2e9f2a2a0997e4523699cceff1a5a201605709b7)
@@ -570,6 +570,8 @@
         public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenLogMessagesAddedOutputSet()
         {
             // Given
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName");
+
             var mockRepository = new MockRepository();
             var assessmentSection = new AssessmentSectionStub
             {
@@ -579,11 +581,21 @@
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
                     }
                 }
             };
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName");
             assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
             {
                 hydraulicBoundaryLocation
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -r976640f418ae7996c54296d7a81bf1d3d034ff28 -r2e9f2a2a0997e4523699cceff1a5a201605709b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 976640f418ae7996c54296d7a81bf1d3d034ff28)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 2e9f2a2a0997e4523699cceff1a5a201605709b7)
@@ -604,6 +604,7 @@
             {
                 HydraulicBoundaryData =
                 {
+                    FilePath = validHrdFilePath,
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath,
@@ -690,7 +691,8 @@
             const double targetProbability = 0.01;
             const string locationName = "locationName";
 
-            var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName));
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
+            var calculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
             var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(targetProbability)
             {
                 HydraulicBoundaryLocationCalculations =
@@ -707,6 +709,17 @@
                     HydraulicLocationConfigurationDatabase =
                     {
                         FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = validHrdFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
                     }
                 },
                 WaveHeightCalculationsForUserDefinedTargetProbabilities =