Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs
===================================================================
diff -u -r15565f69a7b2997da904f005a25d582502cef7e1 -r68bdd48d5bd8e7c5d788ebe5b5872acf596d669d
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 15565f69a7b2997da904f005a25d582502cef7e1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 68bdd48d5bd8e7c5d788ebe5b5872acf596d669d)
@@ -31,10 +31,7 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Data.TestUtil;
-using Ringtoets.Piping.KernelWrapper.SubCalculator;
-using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator;
 using Ringtoets.Piping.Primitives;
 
 namespace Ringtoets.Piping.Data.Test
@@ -81,31 +78,13 @@
                 CoefficientOfVariation = RoundedDouble.NaN
             };
 
-            var thicknessCoverageLayer = new LogNormalDistribution(2)
-            {
-                Mean = RoundedDouble.NaN,
-                StandardDeviation = (RoundedDouble) 0.5
-            };
-
             var saturatedVolumicWeightOfCoverageLayer = new LogNormalDistribution(2)
             {
                 Mean = RoundedDouble.NaN,
                 StandardDeviation = RoundedDouble.NaN,
                 Shift = RoundedDouble.NaN
             };
 
-            var thicknessAquiferLayer = new LogNormalDistribution(2)
-            {
-                Mean = RoundedDouble.NaN,
-                StandardDeviation = (RoundedDouble) 0.5
-            };
-
-            var seepageLength = new VariationCoefficientLogNormalDistribution(2)
-            {
-                Mean = RoundedDouble.NaN,
-                CoefficientOfVariation = (RoundedDouble) 0.1
-            };
-
             var generalInputParameters = new GeneralPipingInput();
 
             // Call
@@ -137,15 +116,10 @@
             Assert.AreEqual(generalInputParameters.BeddingAngle, inputParameters.BeddingAngle);
             Assert.AreEqual(generalInputParameters.MeanDiameter70, inputParameters.MeanDiameter70);
 
-            DistributionAssert.AreEqual(thicknessCoverageLayer, inputParameters.ThicknessCoverageLayer);
-
             DistributionAssert.AreEqual(saturatedVolumicWeightOfCoverageLayer, inputParameters.SaturatedVolumicWeightOfCoverageLayer);
             Assert.AreEqual(2, inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift.NumberOfDecimalPlaces);
             Assert.IsNaN(inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift);
 
-            DistributionAssert.AreEqual(thicknessAquiferLayer, inputParameters.ThicknessAquiferLayer);
-            DistributionAssert.AreEqual(seepageLength, inputParameters.SeepageLength);
-
             Assert.IsNaN(inputParameters.ExitPointL);
             Assert.AreEqual(2, inputParameters.ExitPointL.NumberOfDecimalPlaces);
             Assert.IsNaN(inputParameters.EntryPointL);
@@ -761,357 +735,6 @@
         }
 
         [Test]
-        public void ThicknessAquiferLayer_SoilProfileSingleAquiferAndCoverageUnderSurfaceLine_ReturnsThicknessAquiferLayer()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.AreEqual(1.0, thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_InputWithoutSoilProfile_MeansSetToNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = null;
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_InputWithoutSurfaceLine_MeansSetToNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.SurfaceLine = null;
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        [TestCase(1e-6)]
-        [TestCase(1)]
-        public void ThicknessAquiferLayer_SoilProfileSingleAquiferAboveSurfaceLine_ThicknessCoverageLayerNaN(double deltaAboveSurfaceLine)
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_SoilProfileMultipleAquiferUnderSurfaceLine_AquiferMeanSetToConsecutiveAquiferLayerThickness()
-        {
-            // Setup
-            double expectedThickness;
-            PipingInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out expectedThickness);
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.AreEqual(expectedThickness, thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_MeanSetExitPointSetToNaN_ThicknessAquiferLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.ExitPointL = RoundedDouble.NaN;
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_ProfileWithoutAquiferLayer_ThicknessAquiferLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = new PipingStochasticSoilProfile(
-                0.0, new PipingSoilProfile(string.Empty, 0, new[]
-                {
-                    new PipingSoilLayer(2.0)
-                    {
-                        IsAquifer = false
-                    }
-                }, SoilProfileType.SoilProfile1D)
-            );
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_SoilProfileSingleAquiferUnderSurfaceLine_ThicknessAquiferLayerMeanSet()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquifer();
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.AreEqual(1.0, thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_SoilProfileMultipleAquiferUnderSurfaceLine_MeanSetToConsecutiveAquiferLayerThickness()
-        {
-            // Setup
-            double expectedThickness;
-            PipingInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out expectedThickness);
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.AreEqual(expectedThickness, thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_MeanSetSoilProfileSetToNull_ThicknessAquiferLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-
-            input.StochasticSoilProfile = null;
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_InputResultsInZeroAquiferThickness_ThicknessAquiferLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = new PipingStochasticSoilProfile(
-                0.0, new PipingSoilProfile(string.Empty, 0, new[]
-                {
-                    new PipingSoilLayer(2.0)
-                    {
-                        IsAquifer = false
-                    },
-                    new PipingSoilLayer(0.0)
-                    {
-                        IsAquifer = true
-                    }
-                }, SoilProfileType.SoilProfile1D)
-            );
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessAquiferLayer_SurfaceLineHalfWayProfileLayer_ThicknessSetToLayerHeightUnderSurfaceLine()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = new PipingStochasticSoilProfile(
-                0.0, new PipingSoilProfile(string.Empty, 0, new[]
-                {
-                    new PipingSoilLayer(2.5)
-                    {
-                        IsAquifer = true
-                    },
-                    new PipingSoilLayer(1.5)
-                    {
-                        IsAquifer = true
-                    }
-                }, SoilProfileType.SoilProfile1D)
-            );
-
-            // Call
-            LogNormalDistribution thicknessAquiferLayer = input.ThicknessAquiferLayer;
-
-            // Assert
-            Assert.AreEqual(2.0, thicknessAquiferLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessCoverageLayer_InputWithoutSoilProfile_MeansSetToNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = null;
-
-            // Call
-            LogNormalDistribution thicknessCoverageLayer = input.ThicknessCoverageLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessCoverageLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessCoverageLayer_InputWithoutSurfaceLine_MeansSetToNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.SurfaceLine = null;
-
-            // Call
-            LogNormalDistribution thicknessCoverageLayer = input.ThicknessCoverageLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessCoverageLayer.Mean);
-        }
-
-        [Test]
-        [TestCase(1e-6)]
-        [TestCase(1)]
-        public void ThicknessCoverageLayer_SoilProfileSingleAquiferAboveSurfaceLine_ThicknessCoverageLayerNaN(double deltaAboveSurfaceLine)
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
-
-            // Call
-            LogNormalDistribution thicknessCoverageLayer = input.ThicknessCoverageLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessCoverageLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessCoverageLayer_MeanSetSoilProfileSetToNull_ThicknessCoverageLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.ThicknessCoverageLayer.Mean = new RoundedDouble(2, new Random(21).NextDouble() + 1);
-
-            input.StochasticSoilProfile = null;
-
-            // Call
-            LogNormalDistribution thicknessCoverageLayer = input.ThicknessCoverageLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessCoverageLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessCoverageLayer_ProfileWithoutAquiferLayer_ThicknessCoverageLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = new PipingStochasticSoilProfile(
-                0.0, new PipingSoilProfile(string.Empty, 0, new[]
-                {
-                    new PipingSoilLayer(2.0)
-                    {
-                        IsAquifer = false
-                    }
-                }, SoilProfileType.SoilProfile1D)
-            );
-
-            // Call
-            LogNormalDistribution thicknessCoverageLayer = input.ThicknessCoverageLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessCoverageLayer.Mean);
-        }
-
-        [Test]
-        public void ThicknessCoverageLayer_InputResultsInZeroCoverageThickness_ThicknessCoverageLayerNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.StochasticSoilProfile = new PipingStochasticSoilProfile(
-                0.0, new PipingSoilProfile(string.Empty, 0, new[]
-                {
-                    new PipingSoilLayer(2.0)
-                    {
-                        IsAquifer = false
-                    },
-                    new PipingSoilLayer(2.0)
-                    {
-                        IsAquifer = true
-                    }
-                }, SoilProfileType.SoilProfile1D)
-            );
-
-            // Call
-            LogNormalDistribution thicknessCoverageLayer = input.ThicknessCoverageLayer;
-
-            // Assert
-            Assert.IsNaN(thicknessCoverageLayer.Mean);
-        }
-
-        [Test]
-        public void SeepageLength_ValidData_ReturnsSeepageLength()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-
-            // Call
-            VariationCoefficientLogNormalDistribution seepageLength = input.SeepageLength;
-
-            // Assert
-            Assert.AreEqual(0.5, seepageLength.Mean);
-            Assert.AreEqual(0.1, seepageLength.CoefficientOfVariation);
-        }
-
-        [Test]
-        public void SeepageLength_EntryPointNaN_SeepageLengthNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.EntryPointL = RoundedDouble.NaN;
-
-            // Call
-            VariationCoefficientLogNormalDistribution seepageLength = input.SeepageLength;
-
-            // Assert
-            Assert.IsNaN(seepageLength.Mean);
-            Assert.AreEqual(0.1, seepageLength.CoefficientOfVariation);
-        }
-
-        [Test]
-        public void SeepageLength_ExitPointNaN_SeepageLengthNaN()
-        {
-            // Setup
-            PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
-            input.ExitPointL = RoundedDouble.NaN;
-
-            // Call
-            VariationCoefficientLogNormalDistribution seepageLength = input.SeepageLength;
-
-            // Assert
-            Assert.IsNaN(seepageLength.Mean);
-            Assert.AreEqual(0.1, seepageLength.CoefficientOfVariation);
-        }
-
-        [Test]
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup