Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs
===================================================================
diff -u -r204265dc343093a3145565384151e84c888e4db5 -rff05cdd201481867c9b71ece4cc8b423f2ec102f
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision 204265dc343093a3145565384151e84c888e4db5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/DerivedPipingInputTest.cs	(.../DerivedPipingInputTest.cs)	(revision ff05cdd201481867c9b71ece4cc8b423f2ec102f)
@@ -51,7 +51,7 @@
         public void GetPiezometricHeadExit_ValidInput_SetsParametersForCalculatorAndReturnsNotNaN()
         {
             // Setup
-            var input = new PipingInput(new GeneralPipingInput());
+            var input = new TestPipingInput();
 
             using (new PipingSubCalculatorFactoryConfig())
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs
===================================================================
diff -u -r204265dc343093a3145565384151e84c888e4db5 -rff05cdd201481867c9b71ece4cc8b423f2ec102f
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs	(.../SemiProbabilisticPipingDesignVariableFactoryTest.cs)	(revision 204265dc343093a3145565384151e84c888e4db5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs	(.../SemiProbabilisticPipingDesignVariableFactoryTest.cs)	(revision ff05cdd201481867c9b71ece4cc8b423f2ec102f)
@@ -95,7 +95,7 @@
         public void GetThicknessCoverageLayer_PipingInputWithoutCoverLayer_CreateDeterministicDesignVariableForThicknessCoverageLayer()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             DesignVariable<LogNormalDistribution> thicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(inputParameters);
@@ -126,7 +126,7 @@
         public void GetEffectiveThicknessCoverageLayer_PipingInputWithoutCoverLayer_CreateDeterministicDesignVariableForEffectiveThicknessCoverageLayer()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             DesignVariable<LogNormalDistribution> effectiveThicknessCoverageLayer =
@@ -142,22 +142,22 @@
         public void GetPhreaticLevelExit_ValidPipingCalculation_CreateDesignVariableForPhreaticLevelExit()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
-            DesignVariable<NormalDistribution> freaticLevelExit =
+            DesignVariable<NormalDistribution> phreaticLevelExit =
                 SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(inputParameters);
 
             // Assert
-            Assert.AreSame(inputParameters.PhreaticLevelExit, freaticLevelExit.Distribution);
-            AssertPercentile(0.05, freaticLevelExit);
+            Assert.AreSame(inputParameters.PhreaticLevelExit, phreaticLevelExit.Distribution);
+            AssertPercentile(0.05, phreaticLevelExit);
         }
 
         [Test]
         public void GetDampingFactorExit_ValidPipingCalculation_CreateDesignVariableForDampingFactorExit()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             DesignVariable<LogNormalDistribution> dampingFactorExit =
@@ -176,7 +176,7 @@
         public void GetSeepageLength_ValidPipingCalculation_CreateDesignVariableForSeepageLength()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> seepageLength =
@@ -191,7 +191,7 @@
         public void GetDiameter70_ValidPipingCalculation_CreateDesignVariableForDiameter70()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> d70 =
@@ -206,7 +206,7 @@
         public void GetDarcyPermeability_ValidPipingCalculation_CreateDesignVariableForDarcyPermeability()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> darcyPermeability =
@@ -241,7 +241,7 @@
         public void GetSaturatedVolumicWeightOfCoverageLayer_PipingInputWithoutCoverLayer_CreateDeterministicDesignVariableForSaturatedVolumicWeightOfCoverageLayer()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             DesignVariable<LogNormalDistribution> saturatedVolumicWeightOfCoverageLayer =
@@ -258,7 +258,7 @@
         public void GetThicknessAquiferLayer_ValidPipingCalculation_CreateDesignVariableForThicknessAquiferLayer()
         {
             // Setup
-            var inputParameters = new PipingInput(new GeneralPipingInput());
+            var inputParameters = new TestPipingInput();
 
             // Call
             DesignVariable<LogNormalDistribution> thicknessAquiferLayer =
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/TestPipingCalculationTest.cs
===================================================================
diff -u -r7c166a03db65a51e3a8de0a29b66c2d1571b466d -rff05cdd201481867c9b71ece4cc8b423f2ec102f
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/TestPipingCalculationTest.cs	(.../TestPipingCalculationTest.cs)	(revision 7c166a03db65a51e3a8de0a29b66c2d1571b466d)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/TestPipingCalculationTest.cs	(.../TestPipingCalculationTest.cs)	(revision ff05cdd201481867c9b71ece4cc8b423f2ec102f)
@@ -41,7 +41,7 @@
         public void Constructor_WithPipingInput_ExpectedValues()
         {
             // Setup
-            var pipingInput = new PipingInput(new GeneralPipingInput());
+            var pipingInput = new TestPipingInput(new GeneralPipingInput());
 
             // Call
             var calculation = new TestPipingCalculation(pipingInput);