Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs
===================================================================
diff -u -r8805f03189f521994b42a519bbca7561bf12eb68 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs	(.../DesignVariable.cs)	(revision 8805f03189f521994b42a519bbca7561bf12eb68)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs	(.../DesignVariable.cs)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -21,32 +21,21 @@
 
 using System;
 using Core.Common.Base.Data;
-using MathNet.Numerics.Distributions;
 using Ringtoets.Common.Data.Properties;
 
 namespace Ringtoets.Common.Data.Probabilistics
 {
-    /// <summary>
-    /// This class is a representation of a variable derived from a probabilistic distribution,
-    /// based on a percentile.
-    /// </summary>
-    /// <typeparam name="TDistributionType">The type of the underlying distribution from which a value is 
-    /// derived.</typeparam>
-    public abstract class DesignVariable<TDistributionType> where TDistributionType : IDistribution
-    {
-        private double percentile;
+    public abstract class DesignVariable<TDistributionType> where TDistributionType : IDistribution {
         private TDistributionType distribution;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DesignVariable{T}"/> class with 
-        /// <see cref="Percentile"/> equal to 0.5.
+        /// Initializes a new instance of the <see cref="DesignVariable{T}"/> class.
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <see cref="Distribution"/> is 
         /// <c>null</c>.</exception>
         protected DesignVariable(TDistributionType distribution)
         {
             Distribution = distribution;
-            percentile = 0.5;
         }
 
         /// <summary>
@@ -71,45 +60,9 @@
         }
 
         /// <summary>
-        /// Gets or sets the percentile used to derive a deterministic value based on <see cref="Distribution"/>.
+        /// Gets a projected (design) value based on the <see cref="Distribution"/>.
         /// </summary>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="value"/> 
-        /// is not in range [0,1].</exception>
-        public double Percentile
-        {
-            get
-            {
-                return percentile;
-            }
-            set
-            {
-                if (value < 0.0 || value > 1.0)
-                {
-                    throw new ArgumentOutOfRangeException("value", Resources.DesignVariable_Percentile_must_be_in_range);
-                }
-                percentile = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the design value based on the <see cref="Distribution"/> and <see cref="Percentile"/>.
-        /// </summary>
         /// <returns>A design value.</returns>
         public abstract RoundedDouble GetDesignValue();
-
-        /// <summary>
-        /// Determines the design value based on a 'normal space' expected value and standard deviation.
-        /// </summary>
-        /// <param name="expectedValue">The expected value.</param>
-        /// <param name="standardDeviation">The standard deviation.</param>
-        /// <returns>The design value</returns>
-        protected double DetermineDesignValue(double expectedValue, double standardDeviation)
-        {
-            // Design factor is determined using the 'probit function', which is the inverse
-            // CDF function of the standard normal distribution. For more information see:
-            // "Quantile function" https://en.wikipedia.org/wiki/Normal_distribution
-            double designFactor = Normal.InvCDF(0.0, 1.0, Percentile);
-            return expectedValue + designFactor*standardDeviation;
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DeterministicDesignVariable.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DeterministicDesignVariable.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DeterministicDesignVariable.cs	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+
+namespace Ringtoets.Common.Data.Probabilistics
+{
+    /// <summary>
+    /// This class defines a design variable for a log-normal distribution.
+    /// </summary>
+    public class DeterministicDesignVariable<T> : DesignVariable<T> where T : IDistribution
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogNormalDistributionDesignVariable"/> class.
+        /// </summary>
+        /// <param name="distribution">A log-normal distribution.</param>
+        public DeterministicDesignVariable(T distribution) : base(distribution) { }
+
+        /// <summary>
+        /// Gets or sets the value that was set to be returned for the distribution.
+        /// </summary>
+        public double DeterministicValue { get; set; }
+
+        public override RoundedDouble GetDesignValue()
+        {
+            return new RoundedDouble(Distribution.Mean.NumberOfDecimalPlaces, DeterministicValue);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistributionDesignVariable.cs
===================================================================
diff -u -r4bab160dd44cb5e104ad8fbf2bb49add8227c116 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistributionDesignVariable.cs	(.../LogNormalDistributionDesignVariable.cs)	(revision 4bab160dd44cb5e104ad8fbf2bb49add8227c116)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistributionDesignVariable.cs	(.../LogNormalDistributionDesignVariable.cs)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -27,7 +27,7 @@
     /// <summary>
     /// This class defines a design variable for a log-normal distribution.
     /// </summary>
-    public class LogNormalDistributionDesignVariable : DesignVariable<LogNormalDistribution>
+    public class LogNormalDistributionDesignVariable : PercentileBasedDesignVariable<LogNormalDistribution>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LogNormalDistributionDesignVariable"/> class.
@@ -42,7 +42,7 @@
         }
 
         /// <summary>
-        /// Projects <see cref="DesignVariable{DistributionType}.Distribution"/> into 'normal
+        /// Projects <see cref="PercentileBasedDesignVariable{TDistributionType}.Distribution"/> into 'normal
         /// distribution' space and calculates the design value for that value space.
         /// </summary>
         /// <returns>The design value in 'normal distribution' space.</returns>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs
===================================================================
diff -u -rd9ca53f8fa89c230d499c7ac28b3b0b8e9290fe5 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs	(.../NormalDistributionDesignVariable.cs)	(revision d9ca53f8fa89c230d499c7ac28b3b0b8e9290fe5)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs	(.../NormalDistributionDesignVariable.cs)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -26,7 +26,7 @@
     /// <summary>
     /// This class defines a design variable for a normal distribution.
     /// </summary>
-    public class NormalDistributionDesignVariable : DesignVariable<NormalDistribution>
+    public class NormalDistributionDesignVariable : PercentileBasedDesignVariable<NormalDistribution>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="NormalDistributionDesignVariable"/> class.
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -0,0 +1,85 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using MathNet.Numerics.Distributions;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.Common.Data.Probabilistics
+{
+    /// <summary>
+    /// This class is a representation of a variable derived from a probabilistic distribution,
+    /// based on a percentile.
+    /// </summary>
+    /// <typeparam name="TDistributionType">The type of the underlying distribution from which a value is 
+    /// derived.</typeparam>
+    public abstract class PercentileBasedDesignVariable<TDistributionType> : DesignVariable<TDistributionType> where TDistributionType : IDistribution
+    {
+        private double percentile;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PercentileBasedDesignVariable{TDistributionType}"/> class with 
+        /// <see cref="Percentile"/> equal to 0.5.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown when <see cref="DesignVariable{TDistributionType}.Distribution"/> is 
+        /// <c>null</c>.</exception>
+        protected PercentileBasedDesignVariable(TDistributionType distribution) : base(distribution)
+        {
+            percentile = 0.5;
+        }
+
+        /// <summary>
+        /// Gets or sets the percentile used to derive a deterministic value based on <see cref="DesignVariable{TDistributionType}.Distribution"/>.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="value"/> 
+        /// is not in range [0,1].</exception>
+        public double Percentile
+        {
+            get
+            {
+                return percentile;
+            }
+            set
+            {
+                if (value < 0.0 || value > 1.0)
+                {
+                    throw new ArgumentOutOfRangeException("value", Resources.DesignVariable_Percentile_must_be_in_range);
+                }
+                percentile = value;
+            }
+        }
+
+        /// <summary>
+        /// Determines the design value based on a 'normal space' expected value and standard deviation.
+        /// </summary>
+        /// <param name="expectedValue">The expected value.</param>
+        /// <param name="standardDeviation">The standard deviation.</param>
+        /// <returns>The design value</returns>
+        protected double DetermineDesignValue(double expectedValue, double standardDeviation)
+        {
+            // Design factor is determined using the 'probit function', which is the inverse
+            // CDF function of the standard normal distribution. For more information see:
+            // "Quantile function" https://en.wikipedia.org/wiki/Normal_distribution
+            double designFactor = Normal.InvCDF(0.0, 1.0, Percentile);
+            return expectedValue + designFactor*standardDeviation;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -55,7 +55,9 @@
     <Compile Include="Hydraulics\HydraulicBoundaryDatabase.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryLocation.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryLocationOutput.cs" />
+    <Compile Include="Probabilistics\DeterministicDesignVariable.cs" />
     <Compile Include="Probabilistics\IVariationCoefficientDistribution.cs" />
+    <Compile Include="Probabilistics\PercentileBasedDesignVariable.cs" />
     <Compile Include="Probabilistics\TruncatedNormalDistribution.cs" />
     <Compile Include="Probabilistics\VariationCoefficientLogNormalDistribution.cs" />
     <Compile Include="Probabilistics\VariationCoefficientNormalDistribution.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs
===================================================================
diff -u -r11b25a9a8ba5c1fcadad1e32fa072e159aafff26 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs	(.../DesignVariableTest.cs)	(revision 11b25a9a8ba5c1fcadad1e32fa072e159aafff26)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs	(.../DesignVariableTest.cs)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -43,7 +43,6 @@
 
             // Assert
             Assert.AreSame(distributionMock, designVariable.Distribution);
-            Assert.AreEqual(0.5, designVariable.Percentile);
             mocks.VerifyAll(); // Expect no calls on mocks
         }
 
@@ -63,54 +62,6 @@
         }
 
         [Test]
-        [TestCase(-1234.5678)]
-        [TestCase(0 - 1e-6)]
-        [TestCase(1 + 1e-6)]
-        [TestCase(12345.789)]
-        public void Percentile_SettingInvalidValue_ThrowArgumentOutOfRangeException(double invalidPercentile)
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var distributionMock = mocks.StrictMock<IDistribution>();
-            mocks.ReplayAll();
-
-            var designVariable = new SimpleDesignVariable(distributionMock);
-
-            // Call
-            TestDelegate call = () => designVariable.Percentile = invalidPercentile;
-
-            // Assert
-            var exception = Assert.Throws<ArgumentOutOfRangeException>(call);
-            string customMessagePart = exception.Message.Split(new[]
-            {
-                Environment.NewLine
-            }, StringSplitOptions.RemoveEmptyEntries)[0];
-            Assert.AreEqual("Percentiel moet in het bereik [0, 1] liggen.", customMessagePart);
-            mocks.VerifyAll(); // Expect no calls on mocks
-        }
-
-        [Test]
-        [TestCase(0.0)]
-        [TestCase(0.54638291)]
-        [TestCase(1.0)]
-        public void Percentile_SettingValidValue_PropertySet(double validPercentile)
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var distributionMock = mocks.StrictMock<IDistribution>();
-            mocks.ReplayAll();
-
-            var designVariable = new SimpleDesignVariable(distributionMock);
-
-            // Call
-            designVariable.Percentile = validPercentile;
-
-            // Assert
-            Assert.AreEqual(validPercentile, designVariable.Percentile);
-            mocks.VerifyAll(); // Expect no calls on mocks
-        }
-
-        [Test]
         public void Distribution_SetToNull_ThrowArgumentNullException()
         {
             // Setup
@@ -135,7 +86,7 @@
 
         private class SimpleDesignVariable : DesignVariable<IDistribution>
         {
-            public SimpleDesignVariable(IDistribution distribution) : base(distribution) {}
+            public SimpleDesignVariable(IDistribution distribution) : base(distribution) { }
 
             public override RoundedDouble GetDesignValue()
             {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/PercentileBasedDesignVariableTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/PercentileBasedDesignVariableTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/PercentileBasedDesignVariableTest.cs	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -0,0 +1,109 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base.Data;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.Probabilistics;
+
+namespace Ringtoets.Common.Data.Test.Probabilistics
+{
+    [TestFixture]
+    public class PercentileBasedDesignVariableTest
+    {
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var distributionMock = mocks.StrictMock<IDistribution>();
+            mocks.ReplayAll();
+
+            // Call
+            var designVariable = new SimpleDesignVariable(distributionMock);
+
+            // Assert
+            Assert.IsInstanceOf<DesignVariable<IDistribution>>(designVariable);
+            Assert.AreSame(distributionMock, designVariable.Distribution);
+            Assert.AreEqual(0.5, designVariable.Percentile);
+            mocks.VerifyAll(); // Expect no calls on mocks
+        }
+
+        [Test]
+        [TestCase(-1234.5678)]
+        [TestCase(0 - 1e-6)]
+        [TestCase(1 + 1e-6)]
+        [TestCase(12345.789)]
+        public void Percentile_SettingInvalidValue_ThrowArgumentOutOfRangeException(double invalidPercentile)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var distributionMock = mocks.StrictMock<IDistribution>();
+            mocks.ReplayAll();
+
+            var designVariable = new SimpleDesignVariable(distributionMock);
+
+            // Call
+            TestDelegate call = () => designVariable.Percentile = invalidPercentile;
+
+            // Assert
+            var exception = Assert.Throws<ArgumentOutOfRangeException>(call);
+            string customMessagePart = exception.Message.Split(new[]
+            {
+                Environment.NewLine
+            }, StringSplitOptions.RemoveEmptyEntries)[0];
+            Assert.AreEqual("Percentiel moet in het bereik [0, 1] liggen.", customMessagePart);
+            mocks.VerifyAll(); // Expect no calls on mocks
+        }
+
+        [Test]
+        [TestCase(0.0)]
+        [TestCase(0.54638291)]
+        [TestCase(1.0)]
+        public void Percentile_SettingValidValue_PropertySet(double validPercentile)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var distributionMock = mocks.StrictMock<IDistribution>();
+            mocks.ReplayAll();
+
+            var designVariable = new SimpleDesignVariable(distributionMock);
+
+            // Call
+            designVariable.Percentile = validPercentile;
+
+            // Assert
+            Assert.AreEqual(validPercentile, designVariable.Percentile);
+            mocks.VerifyAll(); // Expect no calls on mocks
+        }
+
+        private class SimpleDesignVariable : PercentileBasedDesignVariable<IDistribution>
+        {
+            public SimpleDesignVariable(IDistribution distribution) : base(distribution) {}
+
+            public override RoundedDouble GetDesignValue()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -64,6 +64,7 @@
     <Compile Include="Hydraulics\HydraulicBoundaryDatabaseTest.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryLocationOutputTest.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryLocationTest.cs" />
+    <Compile Include="Probabilistics\DesignVariableTest.cs" />
     <Compile Include="Probabilistics\TruncatedNormalDistributionTest.cs" />
     <Compile Include="Probabilistics\VariationCoefficientLogNormalDistributionTest.cs" />
     <Compile Include="Probabilistics\VariationCoefficientNormalDistributionTest.cs" />
@@ -75,7 +76,7 @@
     <Compile Include="FailureMechanism\FailureMechanismSectionResultTest.cs" />
     <Compile Include="FailureMechanism\FailureMechanismSectionTest.cs" />
     <Compile Include="Calculation\CalculationGroupExtensionsTest.cs" />
-    <Compile Include="Probabilistics\DesignVariableTest.cs" />
+    <Compile Include="Probabilistics\PercentileBasedDesignVariableTest.cs" />
     <Compile Include="Probabilistics\LogNormalDistributionDesignVariableTest.cs" />
     <Compile Include="Probabilistics\LogNormalDistributionTest.cs" />
     <Compile Include="Probabilistics\NormalDistributionDesignVariableTest.cs" />
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs
===================================================================
diff -u -r4bab160dd44cb5e104ad8fbf2bb49add8227c116 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs	(.../PipingSemiProbabilisticDesignValueFactory.cs)	(revision 4bab160dd44cb5e104ad8fbf2bb49add8227c116)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs	(.../PipingSemiProbabilisticDesignValueFactory.cs)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -44,13 +44,25 @@
             };
         }
 
+        private static DesignVariable<LogNormalDistribution> CreateDeterministicDesignVariable(LogNormalDistribution distribution, double deterministicValue)
+        {
+            return new DeterministicDesignVariable<LogNormalDistribution>(distribution)
+            {
+                DeterministicValue = deterministicValue
+            };
+        }
+
         #region General parameters
 
         /// <summary>
         /// Creates the design variable for <see cref="PipingInput.SaturatedVolumicWeightOfCoverageLayer"/>.
         /// </summary>
         public static DesignVariable<LogNormalDistribution> GetSaturatedVolumicWeightOfCoverageLayer(PipingInput parameters)
         {
+            if (double.IsNaN(parameters.SaturatedVolumicWeightOfCoverageLayer.Mean))
+            {
+                return CreateDeterministicDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0);
+            }
             return CreateDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0.05);
         }
 
@@ -59,6 +71,10 @@
         /// </summary>
         public static DesignVariable<LogNormalDistribution> GetThicknessCoverageLayer(PipingInput parameters)
         {
+            if (double.IsNaN(parameters.ThicknessCoverageLayer.Mean))
+            {
+                return CreateDeterministicDesignVariable(parameters.ThicknessCoverageLayer, 0);
+            }
             return CreateDesignVariable(parameters.ThicknessCoverageLayer, 0.05);
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs
===================================================================
diff -u -r375ff37edf7bfb578e804373044eab32700f0e07 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs	(.../PipingSemiProbabilisticDesignValueFactoryTest.cs)	(revision 375ff37edf7bfb578e804373044eab32700f0e07)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs	(.../PipingSemiProbabilisticDesignValueFactoryTest.cs)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -19,9 +19,12 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Linq;
+using Core.Common.Base.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 
 namespace Ringtoets.Piping.KernelWrapper.Test
 {
@@ -31,9 +34,25 @@
         #region General parameters
 
         [Test]
-        public void GetThicknessCoverageLayer_ValidPipingCalculation_CreateDesignVariableForThicknessCoverageLayer()
+        public void GetThicknessCoverageLayer_PipingInputWithCoverLayer_CreateDesignVariableForThicknessCoverageLayer()
         {
             // Setup
+            var inputParameters = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+
+            // Call
+            DesignVariable<LogNormalDistribution> thicknessCoverageLayer = PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(inputParameters);
+
+            // Assert
+            Assert.IsInstanceOf<PercentileBasedDesignVariable<LogNormalDistribution>>(thicknessCoverageLayer);
+            Assert.AreEqual(inputParameters.ThicknessCoverageLayer.Mean, thicknessCoverageLayer.Distribution.Mean);
+            Assert.AreEqual(inputParameters.ThicknessCoverageLayer.StandardDeviation, thicknessCoverageLayer.Distribution.StandardDeviation);
+            AssertPercentile(0.05, thicknessCoverageLayer);
+        }
+
+        [Test]
+        public void GetThicknessCoverageLayer_PipingInputWithoutCoverLayer_CreateDesignVariableForThicknessCoverageLayer()
+        {
+            // Setup
             var inputParameters = new PipingInput(new GeneralPipingInput());
 
             // Call
@@ -42,7 +61,7 @@
             // Assert
             Assert.AreEqual(inputParameters.ThicknessCoverageLayer.Mean, thicknessCoverageLayer.Distribution.Mean);
             Assert.AreEqual(inputParameters.ThicknessCoverageLayer.StandardDeviation, thicknessCoverageLayer.Distribution.StandardDeviation);
-            Assert.AreEqual(0.05, thicknessCoverageLayer.Percentile);
+            Assert.AreEqual(new RoundedDouble(2), thicknessCoverageLayer.GetDesignValue());
         }
 
         [Test]
@@ -56,7 +75,7 @@
 
             // Assert
             Assert.AreSame(inputParameters.PhreaticLevelExit, freaticLevelExit.Distribution);
-            Assert.AreEqual(0.05, freaticLevelExit.Percentile);
+            AssertPercentile(0.05, freaticLevelExit);
         }
 
         [Test]
@@ -70,7 +89,7 @@
 
             // Assert
             Assert.AreSame(inputParameters.DampingFactorExit, dampingFactorExit.Distribution);
-            Assert.AreEqual(0.95, dampingFactorExit.Percentile);
+            AssertPercentile(0.95, dampingFactorExit);
         }
 
         #endregion
@@ -89,7 +108,7 @@
             // Assert
             Assert.AreEqual(inputParameters.SeepageLength.Mean, seepageLength.Distribution.Mean);
             Assert.AreEqual(inputParameters.SeepageLength.StandardDeviation, seepageLength.Distribution.StandardDeviation);
-            Assert.AreEqual(0.05, seepageLength.Percentile);
+            AssertPercentile(0.05, seepageLength);
         }
 
         [Test]
@@ -104,7 +123,7 @@
             // Assert
             Assert.AreEqual(inputParameters.Diameter70.Mean, d70.Distribution.Mean);
             Assert.AreEqual(inputParameters.Diameter70.StandardDeviation, d70.Distribution.StandardDeviation);
-            Assert.AreEqual(0.05, d70.Percentile);
+            AssertPercentile(0.05, d70);
         }
 
         [Test]
@@ -119,13 +138,33 @@
             // Assert
             Assert.AreEqual(inputParameters.DarcyPermeability.Mean, darcyPermeability.Distribution.Mean);
             Assert.AreEqual(inputParameters.DarcyPermeability.StandardDeviation, darcyPermeability.Distribution.StandardDeviation);
-            Assert.AreEqual(0.95, darcyPermeability.Percentile);
+            AssertPercentile(0.95, darcyPermeability);
         }
 
         [Test]
-        public void GetSaturatedVolumicWeightOfCoverageLayer_ValidPipingCalculation_CreateDesignVariableForSaturatedVolumicWeightOfCoverageLayer()
+        public void GetSaturatedVolumicWeightOfCoverageLayer_PipingInputWithCoverLayerWithSaturatedDefinition_CreateDesignVariableForSaturatedVolumicWeightOfCoverageLayer()
         {
             // Setup
+            var inputParameters = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            inputParameters.StochasticSoilProfile.SoilProfile.Layers.ElementAt(0).BelowPhreaticLevelMean = 3.2;
+
+            // Call
+            DesignVariable<LogNormalDistribution> saturatedVolumicWeightOfCoverageLayer = PipingSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters);
+
+            // Assert
+            Assert.AreEqual(inputParameters.SaturatedVolumicWeightOfCoverageLayer.Mean,
+                            saturatedVolumicWeightOfCoverageLayer.Distribution.Mean);
+            Assert.AreEqual(inputParameters.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation,
+                            saturatedVolumicWeightOfCoverageLayer.Distribution.StandardDeviation);
+            Assert.AreEqual(inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift,
+                            saturatedVolumicWeightOfCoverageLayer.Distribution.Shift);
+            AssertPercentile(0.05, saturatedVolumicWeightOfCoverageLayer);
+        }
+
+        [Test]
+        public void GetSaturatedVolumicWeightOfCoverageLayer_PipingInputWithoutCoverLayer_CreateDesignVariableForSaturatedVolumicWeightOfCoverageLayer()
+        {
+            // Setup
             var inputParameters = new PipingInput(new GeneralPipingInput());
 
             // Call
@@ -138,7 +177,7 @@
                             saturatedVolumicWeightOfCoverageLayer.Distribution.StandardDeviation);
             Assert.AreEqual(inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift,
                             saturatedVolumicWeightOfCoverageLayer.Distribution.Shift);
-            Assert.AreEqual(0.05, saturatedVolumicWeightOfCoverageLayer.Percentile);
+            Assert.AreEqual(new RoundedDouble(2), saturatedVolumicWeightOfCoverageLayer.GetDesignValue());
         }
 
         [Test]
@@ -153,9 +192,16 @@
             // Assert
             Assert.AreEqual(inputParameters.ThicknessAquiferLayer.Mean, thicknessAquiferLayer.Distribution.Mean);
             Assert.AreEqual(inputParameters.ThicknessAquiferLayer.StandardDeviation, thicknessAquiferLayer.Distribution.StandardDeviation);
-            Assert.AreEqual(0.95, thicknessAquiferLayer.Percentile);
+            AssertPercentile(0.95, thicknessAquiferLayer);
         }
 
         #endregion
+
+        private void AssertPercentile<T>(double percentile, DesignVariable<T> designVariable) where T : IDistribution
+        {
+            Assert.IsInstanceOf<PercentileBasedDesignVariable<T>>(designVariable);
+            var percentileBasedDesignVariable = (PercentileBasedDesignVariable<T>) designVariable;
+            Assert.AreEqual(percentile, percentileBasedDesignVariable.Percentile);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Ringtoets.Piping.KernelWrapper.Test.csproj
===================================================================
diff -u -r76095f14a847cd54fd958c5b326f7eb903dfd456 -r977a58268db81a93ad74f6079b41cf40d43fb1aa
--- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Ringtoets.Piping.KernelWrapper.Test.csproj	(.../Ringtoets.Piping.KernelWrapper.Test.csproj)	(revision 76095f14a847cd54fd958c5b326f7eb903dfd456)
+++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Ringtoets.Piping.KernelWrapper.Test.csproj	(.../Ringtoets.Piping.KernelWrapper.Test.csproj)	(revision 977a58268db81a93ad74f6079b41cf40d43fb1aa)
@@ -97,6 +97,10 @@
       <Project>{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}</Project>
       <Name>Ringtoets.Piping.Primitives</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.Data.TestUtil\Ringtoets.Piping.Data.TestUtil.csproj">
+      <Project>{955E574D-67CE-4347-AA6B-7DF8A04ED754}</Project>
+      <Name>Ringtoets.Piping.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Piping.KernelWrapper.TestUtil\Ringtoets.Piping.KernelWrapper.TestUtil.csproj">
       <Project>{27e0a5c9-3abf-426a-a3da-7d0b83a218c8}</Project>
       <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>