Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs
===================================================================
diff -u -rff05cdd201481867c9b71ece4cc8b423f2ec102f -ra31494f2957ac6d8c30165e63eacd5c8023129fd
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision ff05cdd201481867c9b71ece4cc8b423f2ec102f)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision a31494f2957ac6d8c30165e63eacd5c8023129fd)
@@ -24,11 +24,8 @@
 using NUnit.Framework;
 using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
-using Riskeer.Piping.KernelWrapper.SubCalculator;
-using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Riskeer.Piping.Primitives;
 
 namespace Riskeer.Piping.Data.Test
@@ -37,59 +34,6 @@
     public class DerivedPipingInputTest
     {
         [Test]
-        public void GetPiezometricHeadExit_InputNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => DerivedPipingInput.GetPiezometricHeadExit(null, RoundedDouble.NaN);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("input", paramName);
-        }
-
-        [Test]
-        public void GetPiezometricHeadExit_ValidInput_SetsParametersForCalculatorAndReturnsNotNaN()
-        {
-            // Setup
-            var input = new TestPipingInput();
-
-            using (new PipingSubCalculatorFactoryConfig())
-            {
-                // Setup
-                var assessmentLevel = (RoundedDouble) 1.1;
-
-                // Call
-                RoundedDouble piezometricHead = DerivedPipingInput.GetPiezometricHeadExit(input, assessmentLevel);
-
-                // Assert
-                Assert.AreEqual(2, piezometricHead.NumberOfDecimalPlaces);
-                Assert.IsFalse(double.IsNaN(piezometricHead));
-
-                var factory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance;
-                PiezoHeadCalculatorStub piezometricHeadAtExitCalculator = factory.LastCreatedPiezometricHeadAtExitCalculator;
-
-                Assert.AreEqual(assessmentLevel, piezometricHeadAtExitCalculator.HRiver, assessmentLevel.GetAccuracy());
-                Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder,
-                                input.PhreaticLevelExit.GetAccuracy());
-                Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit,
-                                input.DampingFactorExit.GetAccuracy());
-            }
-        }
-
-        [Test]
-        public void GetPiezometricHeadExit_AssessmentLevelNaN_ReturnsNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer(1.0, 1.0);
-
-            // Call
-            RoundedDouble piezometricHead = DerivedPipingInput.GetPiezometricHeadExit(input, RoundedDouble.NaN);
-
-            // Assert
-            Assert.IsNaN(piezometricHead);
-        }
-
-        [Test]
         public void GetEffectiveThicknessCoverageLayer_InputNull_ThrowsArgumentNullException()
         {
             // Call
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs
===================================================================
diff -u -re6d257528b6a9dcb9f56eda8d320b2a581f2b2a4 -ra31494f2957ac6d8c30165e63eacd5c8023129fd
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs	(.../ProbabilisticPipingInputContextPropertiesTest.cs)	(revision e6d257528b6a9dcb9f56eda8d320b2a581f2b2a4)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextPropertiesTest.cs	(.../ProbabilisticPipingInputContextPropertiesTest.cs)	(revision a31494f2957ac6d8c30165e63eacd5c8023129fd)
@@ -42,6 +42,7 @@
 using Riskeer.Common.Forms.UITypeEditors;
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.Probabilistic;
+using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.SoilProfile;
 using Riskeer.Piping.Data.TestUtil;
 using Riskeer.Piping.Forms.PresentationObjects.Probabilistic;
@@ -548,7 +549,7 @@
             Assert.AreEqual(saturatedVolumicWeightOfCoverageLayer.Shift,
                             properties.SaturatedVolumicWeightOfCoverageLayer.Shift);
 
-            Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(inputParameters, AssessmentSectionTestHelper.GetTestAssessmentLevel()), properties.PiezometricHeadExit);
+            Assert.AreEqual(DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(inputParameters, AssessmentSectionTestHelper.GetTestAssessmentLevel()), properties.PiezometricHeadExit);
 
             VariationCoefficientLogNormalDistribution seepageLength = DerivedPipingInput.GetSeepageLength(inputParameters);
             Assert.AreEqual(seepageLength.Mean, properties.SeepageLength.Mean);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertiesTest.cs
===================================================================
diff -u -red1670445ec105ad209551b6b641068400aa90cc -ra31494f2957ac6d8c30165e63eacd5c8023129fd
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertiesTest.cs	(.../SemiProbabilisticPipingInputContextPropertiesTest.cs)	(revision ed1670445ec105ad209551b6b641068400aa90cc)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertiesTest.cs	(.../SemiProbabilisticPipingInputContextPropertiesTest.cs)	(revision a31494f2957ac6d8c30165e63eacd5c8023129fd)
@@ -617,7 +617,7 @@
                                                         ? inputParameters.AssessmentLevel
                                                         : AssessmentSectionTestHelper.GetTestAssessmentLevel();
 
-            Assert.AreEqual(DerivedPipingInput.GetPiezometricHeadExit(inputParameters, expectedAssessmentLevel), properties.PiezometricHeadExit);
+            Assert.AreEqual(DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(inputParameters, expectedAssessmentLevel), properties.PiezometricHeadExit);
 
             VariationCoefficientLogNormalDistribution seepageLength = DerivedPipingInput.GetSeepageLength(inputParameters);
             Assert.AreEqual(seepageLength.Mean, properties.SeepageLength.Mean);
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r5007379065eb83c6d21cfa16264b9e16fee696d7 -ra31494f2957ac6d8c30165e63eacd5c8023129fd
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs	(.../SemiProbabilisticPipingCalculationServiceTest.cs)	(revision 5007379065eb83c6d21cfa16264b9e16fee696d7)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs	(.../SemiProbabilisticPipingCalculationServiceTest.cs)	(revision a31494f2957ac6d8c30165e63eacd5c8023129fd)
@@ -1116,7 +1116,7 @@
             double thicknessCoverageLayerAccuracy = DerivedPipingInput.GetThicknessCoverageLayer(input).GetAccuracy();
             RoundedDouble expectedPhreaticLevelExitDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue();
             double phreaticLevelExitDesignAccuracy = input.PhreaticLevelExit.GetAccuracy();
-            double expectedPiezometricHeadExit = DerivedPipingInput.GetPiezometricHeadExit(input, expectedAssessmentLevel).Value;
+            double expectedPiezometricHeadExit = DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(input, expectedAssessmentLevel).Value;
             RoundedDouble expectedDampingFactorExitDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue();
             double dampingFactorExitAccuracy = input.DampingFactorExit.GetAccuracy();