Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r3c10891728420f1c0aa0071574bbfb149710c556 -rc0a3ced404197fd781c6fcbcfc21c6676592be57
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 3c10891728420f1c0aa0071574bbfb149710c556)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision c0a3ced404197fd781c6fcbcfc21c6676592be57)
@@ -8,7 +8,6 @@
 using Ringtoets.Piping.Calculation.TestUtil;
 
 using NUnit.Framework;
-using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Calculation;
 using Ringtoets.Piping.Calculation.TestUtil.SubCalculator;
 using Ringtoets.Piping.Data;
@@ -89,17 +88,14 @@
         public void CalculateThicknessCoverageLayer_ValidInput_ReturnsThickness()
         {
             // Setup
-            PipingInput input = new PipingInput(new GeneralPipingInput())
+            var surfaceLine = new RingtoetsPipingSurfaceLine();
+            surfaceLine.SetGeometry(new[]
             {
-                ExitPointL = (RoundedDouble)10,
-                SurfaceLine = new RingtoetsPipingSurfaceLine()
-            };
-            input.SurfaceLine.SetGeometry(new[]
-            {
                 new Point3D(0, 0, 10),
                 new Point3D(20, 0, 10)
             });
-            input.SoilProfile = new PipingSoilProfile(string.Empty, 0, new[]
+
+            var soilProfile = new PipingSoilProfile(string.Empty, 0, new[]
             {
                 new PipingSoilLayer(5)
                 {
@@ -111,6 +107,13 @@
                 }
             });
 
+            PipingInput input = new PipingInput(new GeneralPipingInput())
+            {
+                ExitPointL = (RoundedDouble) 10,
+                SurfaceLine = surfaceLine,
+                SoilProfile = soilProfile
+            };
+
             // Call
             var thickness = PipingCalculationService.CalculateThicknessCoverageLayer(input);
 
@@ -124,10 +127,7 @@
             // Setup
             PipingInput input = new PipingInput(new GeneralPipingInput())
             {
-                HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0)
-                {
-                    DesignWaterLevel = (RoundedDouble) 0.0
-                }
+                AssessmentLevel = (RoundedDouble) 0.0
             };
 
             // Call
@@ -290,7 +290,6 @@
             var heaveCalculator = testFactory.LastCreatedHeaveCalculator;
             var upliftCalculator = testFactory.LastCreatedUpliftCalculator;
             var sellmeijerCalculator = testFactory.LastCreatedSellmeijerCalculator;
-            var piezometricHeadAtExitCalculator = testFactory.LastCreatedPiezometricHeadAtExitCalculator;
             
             Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(input).GetDesignValue(), heaveCalculator.DTotal,
                             GetAccuracy(input.ThicknessCoverageLayer.Mean));
@@ -299,15 +298,15 @@
             Assert.AreEqual(input.CriticalHeaveGradient, heaveCalculator.Ich);
             Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), heaveCalculator.PhiPolder,
                             GetAccuracy(input.PhreaticLevelExit.Mean));
-            Assert.AreEqual(piezometricHeadAtExitCalculator.PhiExit, heaveCalculator.PhiExit);
+            Assert.AreEqual(input.PiezometricHeadExit.Value, heaveCalculator.PhiExit);
             Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(), heaveCalculator.RExit,
                             GetAccuracy(input.DampingFactorExit.Mean));
 
             Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), upliftCalculator.HExit,
                             GetAccuracy(input.PhreaticLevelExit.Mean));
             Assert.AreEqual(input.AssessmentLevel.Value, upliftCalculator.HRiver);
             Assert.AreEqual(input.UpliftModelFactor, upliftCalculator.ModelFactorUplift);
-            Assert.AreEqual(piezometricHeadAtExitCalculator.PhiExit, upliftCalculator.PhiExit);
+            Assert.AreEqual(input.PiezometricHeadExit.Value, upliftCalculator.PhiExit);
             Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), upliftCalculator.PhiPolder,
                             GetAccuracy(input.PhreaticLevelExit.Mean));
             Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(), upliftCalculator.RExit,