Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs	(.../ISellmeijerCalculator.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs	(.../ISellmeijerCalculator.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Riskeer.Common.Data.Probabilistics;
 
 namespace Riskeer.Piping.KernelWrapper.SubCalculator
 {
@@ -43,7 +42,7 @@
         /// Gets the reduced fall. 
         /// </summary>
         double ReducedFall { get; }
-        
+
         /// <summary>
         /// Gets the factor of safety.
         /// </summary>
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs	(.../SellmeijerCalculator.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs	(.../SellmeijerCalculator.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using Deltares.WTIPiping;
-using Riskeer.Common.Data.Probabilistics;
 
 namespace Riskeer.Piping.KernelWrapper.SubCalculator
 {
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs	(.../UpliftCalculator.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs	(.../UpliftCalculator.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using Deltares.WTIPiping;
-using Riskeer.Common.Data.Probabilistics;
 
 namespace Riskeer.Piping.KernelWrapper.SubCalculator
 {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/GeneralPipingInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/GeneralPipingInputTest.cs	(.../GeneralPipingInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/GeneralPipingInputTest.cs	(.../GeneralPipingInputTest.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -23,6 +23,7 @@
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Common.Data.TestUtil;
 
 namespace Riskeer.Piping.Data.Test
@@ -33,12 +34,25 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            var upliftModelFactor = new LogNormalDistribution(2)
+            {
+                Mean = (RoundedDouble) 1.0,
+                StandardDeviation = (RoundedDouble) 0.1
+            };
+
+            var sellmeijerModelFactor = new LogNormalDistribution(2)
+            {
+                Mean = (RoundedDouble) 1.0,
+                StandardDeviation = (RoundedDouble) 0.12
+            };
+
             // Call
             var inputParameters = new GeneralPipingInput();
 
             // Assert
-            Assert.AreEqual(1.0, inputParameters.UpliftModelFactor);
-            Assert.AreEqual(1.0, inputParameters.SellmeijerModelFactor);
+            DistributionAssert.AreEqual(upliftModelFactor, inputParameters.UpliftModelFactor);
+            DistributionAssert.AreEqual(sellmeijerModelFactor, inputParameters.SellmeijerModelFactor);
 
             Assert.AreEqual(9.81, inputParameters.WaterVolumetricWeight.Value);
             Assert.AreEqual(2, inputParameters.WaterVolumetricWeight.NumberOfDecimalPlaces);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -142,11 +142,11 @@
             };
 
             // Call
-            TestDelegate call = () => pipingInput.ExitPointL = (RoundedDouble) value;
+            void Call() => pipingInput.ExitPointL = (RoundedDouble) value;
 
             // Assert
             const string expectedMessage = "Het uittredepunt moet landwaarts van het intredepunt liggen.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
         }
 
         [Test]
@@ -162,11 +162,11 @@
             input.EntryPointL = RoundedDouble.NaN;
 
             // Call
-            TestDelegate call = () => input.ExitPointL = (RoundedDouble) value;
+            void Call() => input.ExitPointL = (RoundedDouble) value;
 
             // Assert
             const string expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0,0, 1,0]).";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
         }
 
         [Test]
@@ -216,11 +216,11 @@
             };
 
             // Call
-            TestDelegate call = () => pipingInput.EntryPointL = (RoundedDouble) value;
+            void Call() => pipingInput.EntryPointL = (RoundedDouble) value;
 
             // Assert
             const string expectedMessage = "Het uittredepunt moet landwaarts van het intredepunt liggen.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
         }
 
         [Test]
@@ -234,12 +234,13 @@
             // Setup
             PipingInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.ExitPointL = RoundedDouble.NaN;
+
             // Call
-            TestDelegate call = () => input.EntryPointL = (RoundedDouble) value;
+            void Call() => input.EntryPointL = (RoundedDouble) value;
 
             // Assert
             const string expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0,0, 1,0]).";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs	(.../PipingSemiProbabilisticDesignVariableFactoryTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs	(.../PipingSemiProbabilisticDesignVariableFactoryTest.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -48,6 +48,34 @@
         #region General parameters
 
         [Test]
+        public void GetUpliftModelFactorDesignVariable_PipingInputWithCoverLayer_CreateDeterministicDesignVariableForUpliftModelFactor()
+        {
+            // Setup
+            PipingInput inputParameters = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+
+            // Call
+            DesignVariable<LogNormalDistribution> upliftModelFactor = PipingSemiProbabilisticDesignVariableFactory.GetUpliftModelFactorDesignVariable(inputParameters);
+
+            // Assert
+            Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(upliftModelFactor);
+            DistributionAssert.AreEqual(inputParameters.UpliftModelFactor, upliftModelFactor.Distribution);
+        }
+
+        [Test]
+        public void GetSellmeijerModelFactorDesignVariable_PipingInputWithCoverLayer_CreateDeterministicDesignVariableForSellmeijerModelFactor()
+        {
+            // Setup
+            PipingInput inputParameters = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+
+            // Call
+            DesignVariable<LogNormalDistribution> sellmeijerModelFactor = PipingSemiProbabilisticDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(inputParameters);
+
+            // Assert
+            Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(sellmeijerModelFactor);
+            DistributionAssert.AreEqual(inputParameters.SellmeijerModelFactor, sellmeijerModelFactor.Distribution);
+        }
+
+        [Test]
         public void GetThicknessCoverageLayer_PipingInputWithCoverLayer_CreatePercentileBasedDesignVariableForThicknessCoverageLayer()
         {
             // Setup
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r8a5a2af1c372dc43f80d28175359d3cb547b4b86 -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs	(.../PipingFailureMechanismPropertiesTest.cs)	(revision 8a5a2af1c372dc43f80d28175359d3cb547b4b86)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs	(.../PipingFailureMechanismPropertiesTest.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -71,10 +71,10 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new PipingFailureMechanismProperties(null, assessmentSection, handler);
+            void Call() => new PipingFailureMechanismProperties(null, assessmentSection, handler);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("data", paramName);
             mocks.VerifyAll();
         }
@@ -88,10 +88,10 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new PipingFailureMechanismProperties(new PipingFailureMechanism(), null, handler);
+            void Call() => new PipingFailureMechanismProperties(new PipingFailureMechanism(), null, handler);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
@@ -104,10 +104,10 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new PipingFailureMechanismProperties(new PipingFailureMechanism(), assessmentSection, null);
+            void Call() => new PipingFailureMechanismProperties(new PipingFailureMechanism(), assessmentSection, null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("handler", paramName);
             mocks.VerifyAll();
         }
@@ -418,11 +418,11 @@
             var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection, changeHandler);
 
             // Call
-            TestDelegate call = () => properties.A = value;
+            void Call() => properties.A = value;
 
             // Assert
             const string expectedMessage = "De waarde voor 'a' moet in het bereik [0,0, 1,0] liggen.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
             mocks.VerifyAll();
         }
 
@@ -484,12 +484,12 @@
             var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection, changeHandler);
 
             // Call            
-            TestDelegate test = () => properties.WaterVolumetricWeight = roundedValue;
+            void Call() => properties.WaterVolumetricWeight = roundedValue;
 
             // Assert
 
             const string expectedMessage = "De waarde moet binnen het bereik [0,00, 20,00] liggen.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(test, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
             Assert.IsTrue(changeHandler.Called);
             mocks.VerifyAll(); // Does not expect notify observers.
         }
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs	(.../SellmeijerCalculatorStub.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs	(.../SellmeijerCalculatorStub.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 
 namespace Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator
@@ -57,10 +56,10 @@
         public double VolumetricWeightOfWater { get; private set; }
         public double WhitesDragCoefficient { get; private set; }
         public double BottomLevelAquitardAboveExitPointZ { get; private set; }
+        public double Zp { get; private set; }
         public double CreepCoefficient { get; private set; }
         public double CriticalFall { get; private set; }
         public double ReducedFall { get; private set; }
-        public double Zp { get; private set; }
         public double FoSp { get; private set; }
 
         public void SetBeddingAngle(double beddingAngle)