Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r847f6b97f0a6e007a89364ad12d0541bc0d84d1e -r1c01ea681887e96b5b80fb7d23680a4eeac9bd50
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 847f6b97f0a6e007a89364ad12d0541bc0d84d1e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 1c01ea681887e96b5b80fb7d23680a4eeac9bd50)
@@ -55,8 +55,17 @@
         {
             // Setup
             PipingCalculation invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput();
-            invalidPipingCalculation.InputParameters.BeddingAngle = -1;
 
+            // Make invalid by having surfaceline partially above soil profile:
+            double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
+            invalidPipingCalculation.InputParameters.SoilProfile = new PipingSoilProfile("A", 0, new[]
+            {
+                new PipingSoilLayer(highestLevelSurfaceLine-0.5)
+                {
+                    IsAquifer = true
+                } 
+            });
+
             // Call
             Action call = () => PipingCalculationService.Calculate(invalidPipingCalculation);
 
@@ -75,9 +84,11 @@
         public void CalculateThicknessCoverageLayer_ValidInput_ReturnsThickness()
         {
             // Setup
-            PipingInput input = new PipingInput();
-            input.ExitPointL = 10;
-            input.SurfaceLine = new RingtoetsPipingSurfaceLine();
+            PipingInput input = new PipingInput(new GeneralPipingInput())
+            {
+                ExitPointL = 10,
+                SurfaceLine = new RingtoetsPipingSurfaceLine()
+            };
             input.SurfaceLine.SetGeometry(new []
             {
                 new Point3D(0, 0, 10),
@@ -106,9 +117,11 @@
         public void CalculateThicknessCoverageLayer_SurfaceLineOutsideProfile_ThrowsPipingCalculatorException()
         {
             // Setup
-            PipingInput input = new PipingInput();
-            input.ExitPointL = 10;
-            input.SurfaceLine = new RingtoetsPipingSurfaceLine();
+            PipingInput input = new PipingInput(new GeneralPipingInput())
+            {
+                ExitPointL = 10,
+                SurfaceLine = new RingtoetsPipingSurfaceLine()
+            };
             input.SurfaceLine.SetGeometry(new[]
             {
                 new Point3D(0, 0, 10),