Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/CalculationsState/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6c81bfc24736f7b5b5cd7c1869ca45062fc4302a -r6c3c9af3edd2236ac02ffb8638baafd700f58fe7
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/CalculationsState/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6c81bfc24736f7b5b5cd7c1869ca45062fc4302a)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/CalculationsState/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6c3c9af3edd2236ac02ffb8638baafd700f58fe7)
@@ -594,11 +594,22 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var assessmentSection = new AssessmentSectionStub();
+
                 var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
                 TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
 
-                assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
                 assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath = validHlcdFilePath;
+
+                assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
+                {
+                    FilePath = validHrdFilePath,
+                    Locations =
+                    {
+                        hydraulicBoundaryLocation
+                    }
+                });
+
                 assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
                 {
                     hydraulicBoundaryLocation
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6c81bfc24736f7b5b5cd7c1869ca45062fc4302a -r6c3c9af3edd2236ac02ffb8638baafd700f58fe7
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6c81bfc24736f7b5b5cd7c1869ca45062fc4302a)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6c3c9af3edd2236ac02ffb8638baafd700f58fe7)
@@ -1291,11 +1291,23 @@
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
+
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
             TestPipingFailureMechanism failureMechanism = TestPipingFailureMechanism.GetFailureMechanismWithSurfaceLinesAndStochasticSoilModels();
 
-            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
             assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath = validHlcdFilePath;
+
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(
+                new HydraulicBoundaryDatabase
+                {
+                    FilePath = validHrdFilePath,
+                    Locations =
+                    {
+                        hydraulicBoundaryLocation
+                    }
+                });
+
             assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
             {
                 hydraulicBoundaryLocation
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -rad8d317ebb0ba3edf0f7f440807750942fc9dc5f -r6c3c9af3edd2236ac02ffb8638baafd700f58fe7
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs	(.../ProbabilisticPipingCalculationServiceTest.cs)	(revision ad8d317ebb0ba3edf0f7f440807750942fc9dc5f)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs	(.../ProbabilisticPipingCalculationServiceTest.cs)	(revision 6c3c9af3edd2236ac02ffb8638baafd700f58fe7)
@@ -61,15 +61,13 @@
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
 
-        private double testSurfaceLineTopLevel;
         private ProbabilisticPipingCalculation calculation;
 
         [SetUp]
         public void Setup()
         {
             calculation = ProbabilisticPipingCalculationTestFactory.CreateCalculationWithValidInput<TestProbabilisticPipingCalculation>(
                 new TestHydraulicBoundaryLocation());
-            testSurfaceLineTopLevel = calculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
         }
 
         #region Validate
@@ -504,7 +502,7 @@
             const int belowPhreaticLevelShift = 10;
             const double belowPhreaticLevelMeanBase = 15.0;
 
-            var topCoverageLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
+            var topCoverageLayer = new PipingSoilLayer(GetSurfaceLineTopLevel(calculation))
             {
                 IsAquifer = false,
                 BelowPhreaticLevel = new LogNormalDistribution
@@ -604,7 +602,7 @@
                 }
             };
 
-            var completeLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
+            var completeLayer = new PipingSoilLayer(GetSurfaceLineTopLevel(calculation))
             {
                 IsAquifer = false,
                 BelowPhreaticLevel = new LogNormalDistribution
@@ -679,7 +677,7 @@
                 }
             };
 
-            var completeLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
+            var completeLayer = new PipingSoilLayer(GetSurfaceLineTopLevel(calculation))
             {
                 IsAquifer = false,
                 BelowPhreaticLevel = new LogNormalDistribution
@@ -736,7 +734,7 @@
             mocks.ReplayAll();
 
             var random = new Random(21);
-            var incompletePipingSoilLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
+            var incompletePipingSoilLayer = new PipingSoilLayer(GetSurfaceLineTopLevel(calculation))
             {
                 IsAquifer = false,
                 BelowPhreaticLevel = new LogNormalDistribution
@@ -809,7 +807,7 @@
                 failureMechanism, mocks, validHrdFilePath);
             mocks.ReplayAll();
 
-            var topCoverageLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
+            var topCoverageLayer = new PipingSoilLayer(GetSurfaceLineTopLevel(calculation))
             {
                 IsAquifer = false,
                 BelowPhreaticLevel = new LogNormalDistribution
@@ -885,7 +883,7 @@
                 failureMechanism, mocks, validHrdFilePath);
             mocks.ReplayAll();
 
-            var coverageLayerInvalidSaturatedVolumicWeight = new PipingSoilLayer(testSurfaceLineTopLevel)
+            var coverageLayerInvalidSaturatedVolumicWeight = new PipingSoilLayer(GetSurfaceLineTopLevel(calculation))
             {
                 IsAquifer = false,
                 BelowPhreaticLevel = new LogNormalDistribution
@@ -1027,6 +1025,11 @@
             return failureMechanism;
         }
 
+        private static double GetSurfaceLineTopLevel(ProbabilisticPipingCalculation calculation)
+        {
+            return calculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
+        }
+
         #endregion
 
         #region Calculate