Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r2eef3f9d62c90adc922b6e38da1eb77924330311
--- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs	(.../InputParameterCalculationServiceTest.cs)	(revision 2eef3f9d62c90adc922b6e38da1eb77924330311)
@@ -30,7 +30,6 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.KernelWrapper.SubCalculator;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Ringtoets.Piping.Primitives;
 
@@ -62,7 +61,11 @@
 
             // Call
             PipingInput input = invalidPipingCalculation.InputParameters;
-            var result = InputParameterCalculationService.CalculateThicknessCoverageLayer(input.WaterVolumetricWeight, PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile);
+            double result = InputParameterCalculationService.CalculateThicknessCoverageLayer(input.WaterVolumetricWeight,
+                                                                                             PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(),
+                                                                                             input.ExitPointL,
+                                                                                             input.SurfaceLine,
+                                                                                             input.StochasticSoilProfile.SoilProfile);
 
             // Assert
             Assert.IsNaN(result);
@@ -94,15 +97,15 @@
                 }, SoilProfileType.SoilProfile1D, 0)
             };
 
-            PipingInput input = new PipingInput(new GeneralPipingInput())
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 ExitPointL = (RoundedDouble) 10,
                 SurfaceLine = surfaceLine,
                 StochasticSoilProfile = stochasticSoilProfile
             };
 
             // Call
-            var thickness = InputParameterCalculationService.CalculateThicknessCoverageLayer(
+            double thickness = InputParameterCalculationService.CalculateThicknessCoverageLayer(
                 input.WaterVolumetricWeight,
                 PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(),
                 input.ExitPointL,
@@ -117,7 +120,7 @@
         public static void CalculatePiezometricHeadAtExit_Always_ReturnsResult()
         {
             // Setup
-            PipingInput input = new PipingInput(new GeneralPipingInput())
+            var input = new PipingInput(new GeneralPipingInput())
             {
                 HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0)
                 {
@@ -126,7 +129,7 @@
             };
 
             // Call
-            var result = InputParameterCalculationService.CalculatePiezometricHeadAtExit(
+            double result = InputParameterCalculationService.CalculatePiezometricHeadAtExit(
                 input.AssessmentLevel,
                 PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(),
                 PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue());
@@ -155,13 +158,12 @@
 
                 // Assert
                 var testFactory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance;
-                var effectiveThicknessCalculator = testFactory.LastCreatedEffectiveThicknessCalculator;
+                EffectiveThicknessCalculatorStub effectiveThicknessCalculator = testFactory.LastCreatedEffectiveThicknessCalculator;
 
                 Assert.AreEqual(input.ExitPointL.Value, effectiveThicknessCalculator.ExitPointXCoordinate);
-                Assert.AreEqual(
-                    PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(),
-                    effectiveThicknessCalculator.PhreaticLevel,
-                    input.PhreaticLevelExit.GetAccuracy());
+                Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(),
+                                effectiveThicknessCalculator.PhreaticLevel,
+                                input.PhreaticLevelExit.GetAccuracy());
                 AssertEqualSoilProfiles(input.StochasticSoilProfile.SoilProfile, effectiveThicknessCalculator.SoilProfile);
                 AssertEqualSurfaceLines(input.SurfaceLine, effectiveThicknessCalculator.SurfaceLine);
                 Assert.AreEqual(input.WaterVolumetricWeight, effectiveThicknessCalculator.VolumicWeightOfWater);
@@ -186,12 +188,14 @@
 
                 // Assert
                 var testFactory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance;
-                var piezometricHeadAtExitCalculator = testFactory.LastCreatedPiezometricHeadAtExitCalculator;
+                PiezoHeadCalculatorStub piezometricHeadAtExitCalculator = testFactory.LastCreatedPiezometricHeadAtExitCalculator;
 
                 Assert.AreEqual(input.AssessmentLevel.Value, piezometricHeadAtExitCalculator.HRiver);
-                Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder,
+                Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(),
+                                piezometricHeadAtExitCalculator.PhiPolder,
                                 input.PhreaticLevelExit.GetAccuracy());
-                Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit,
+                Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(),
+                                piezometricHeadAtExitCalculator.RExit,
                                 input.DampingFactorExit.GetAccuracy());
             }
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r2eef3f9d62c90adc922b6e38da1eb77924330311
--- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 2eef3f9d62c90adc922b6e38da1eb77924330311)
@@ -29,4 +29,4 @@
 [assembly: AssemblyProduct("Ringtoets.Piping.InputParameterCalculation.Test")]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("998a0525-2378-4729-b0d8-ab90b97cf626")]
+[assembly: Guid("998a0525-2378-4729-b0d8-ab90b97cf626")]
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/Ringtoets.Piping.InputParameterCalculation.Test.csproj
===================================================================
diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -r2eef3f9d62c90adc922b6e38da1eb77924330311
--- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/Ringtoets.Piping.InputParameterCalculation.Test.csproj	(.../Ringtoets.Piping.InputParameterCalculation.Test.csproj)	(revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/Ringtoets.Piping.InputParameterCalculation.Test.csproj	(.../Ringtoets.Piping.InputParameterCalculation.Test.csproj)	(revision 2eef3f9d62c90adc922b6e38da1eb77924330311)
@@ -69,10 +69,6 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>