Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/PipingCalculator.cs
===================================================================
diff -u -r1c01ea681887e96b5b80fb7d23680a4eeac9bd50 -ra2675f58f4d57204df1b8378e9dc1134cd11186e
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/PipingCalculator.cs	(.../PipingCalculator.cs)	(revision 1c01ea681887e96b5b80fb7d23680a4eeac9bd50)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/PipingCalculator.cs	(.../PipingCalculator.cs)	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -24,7 +24,12 @@
 using System.Linq;
 using Deltares.WTIPiping;
 using Ringtoets.Piping.Calculation.Properties;
+using Ringtoets.Piping.Calculation.SubCalculator;
 
+using EffectiveThicknessCalculator = Ringtoets.Piping.Calculation.SubCalculator.EffectiveThicknessCalculator;
+using HeaveCalculator = Ringtoets.Piping.Calculation.SubCalculator.HeaveCalculator;
+using UpliftCalculator = Ringtoets.Piping.Calculation.SubCalculator.UpliftCalculator;
+
 namespace Ringtoets.Piping.Calculation
 {
     /// <summary>
@@ -165,7 +170,7 @@
         {
             try
             {
-                EffectiveThicknessCalculator effectiveThicknessCalculator = CalculateEffectiveThickness();
+                IEffectiveThicknessCalculator effectiveThicknessCalculator = CalculateEffectiveThickness();
                 return CreateUpliftCalculator(effectiveThicknessCalculator.EffectiveStress).Validate();
             }
             catch (Exception exception)
@@ -177,9 +182,9 @@
             }
         }
 
-        private Sellmeijer2011Calculator CalculateSellmeijer()
+        private ISellmeijerCalculator CalculateSellmeijer()
         {
-            Sellmeijer2011Calculator sellmeijerCalculator = CreateSellmeijerCalculator();
+            ISellmeijerCalculator sellmeijerCalculator = CreateSellmeijerCalculator();
 
             try
             {
@@ -197,7 +202,7 @@
             return sellmeijerCalculator;
         }
 
-        private HeaveCalculator CalculateHeave()
+        private IHeaveCalculator CalculateHeave()
         {
             var heaveCalculator = CreateHeaveCalculator();
 
@@ -213,10 +218,10 @@
             return heaveCalculator;
         }
 
-        private WTIUpliftCalculator CalculateUplift()
+        private IUpliftCalculator CalculateUplift()
         {
-            EffectiveThicknessCalculator calculatedEffectiveStressResult = CalculateEffectiveThickness();
-            WTIUpliftCalculator upliftCalculator = CreateUpliftCalculator(calculatedEffectiveStressResult.EffectiveStress);
+            IEffectiveThicknessCalculator calculatedEffectiveStressResult = CalculateEffectiveThickness();
+            IUpliftCalculator upliftCalculator = CreateUpliftCalculator(calculatedEffectiveStressResult.EffectiveStress);
 
             try
             {
@@ -234,7 +239,7 @@
             return upliftCalculator;
         }
 
-        private HeaveCalculator CreateHeaveCalculator()
+        private IHeaveCalculator CreateHeaveCalculator()
         {
             var calculator = new HeaveCalculator
             {
@@ -248,9 +253,9 @@
             return calculator;
         }
 
-        private WTIUpliftCalculator CreateUpliftCalculator(double effectiveStress)
+        private IUpliftCalculator CreateUpliftCalculator(double effectiveStress)
         {
-            var calculator = new WTIUpliftCalculator
+            var calculator = new UpliftCalculator
             {
                 VolumetricWeightOfWater = input.WaterVolumetricWeight,
                 ModelFactorUplift = input.UpliftModelFactor,
@@ -264,9 +269,9 @@
             return calculator;
         }
 
-        private Sellmeijer2011Calculator CreateSellmeijerCalculator()
+        private ISellmeijerCalculator CreateSellmeijerCalculator()
         {
-            var calculator = new Sellmeijer2011Calculator
+            var calculator = new SellmeijerCalculator
             {
                 ModelFactorPiping = input.SellmeijerModelFactor,
                 HRiver = input.AssessmentLevel,
@@ -288,7 +293,7 @@
             return calculator;
         }
 
-        private EffectiveThicknessCalculator CalculateEffectiveThickness()
+        private IEffectiveThicknessCalculator CalculateEffectiveThickness()
         {
             try
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Ringtoets.Piping.Calculation.csproj
===================================================================
diff -u -rc8848af0c6f8780634dcce2013e606f090da6577 -ra2675f58f4d57204df1b8378e9dc1134cd11186e
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Ringtoets.Piping.Calculation.csproj	(.../Ringtoets.Piping.Calculation.csproj)	(revision c8848af0c6f8780634dcce2013e606f090da6577)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Ringtoets.Piping.Calculation.csproj	(.../Ringtoets.Piping.Calculation.csproj)	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -63,6 +63,15 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="SubCalculator\EffectiveThicknessCalculator.cs" />
+    <Compile Include="SubCalculator\HeaveCalculator.cs" />
+    <Compile Include="SubCalculator\IEffectiveThicknessCalculator.cs" />
+    <Compile Include="SubCalculator\IHeaveCalculator.cs" />
+    <Compile Include="SubCalculator\IPipingSubCalculatorFactory.cs" />
+    <Compile Include="SubCalculator\ISellmeijerCalculator.cs" />
+    <Compile Include="SubCalculator\IUpliftCalculator.cs" />
+    <Compile Include="SubCalculator\SellmeijerCalculator.cs" />
+    <Compile Include="SubCalculator\UpliftCalculator.cs" />
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/EffectiveThicknessCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/EffectiveThicknessCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/EffectiveThicknessCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,75 @@
+using Deltares.WTIPiping;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    public class EffectiveThicknessCalculator : IEffectiveThicknessCalculator
+    {
+        private readonly Deltares.WTIPiping.EffectiveThicknessCalculator wrappedCalculator;
+
+        public EffectiveThicknessCalculator()
+        {
+            wrappedCalculator = new Deltares.WTIPiping.EffectiveThicknessCalculator();
+        }
+
+        public double ExitPointXCoordinate
+        {
+            set
+            {
+                wrappedCalculator.ExitPointXCoordinate = value;
+            }
+        }
+
+        public double PhreaticLevel
+        {
+            set
+            {
+                wrappedCalculator.PhreaticLevel = value;
+            }
+        }
+
+        public double VolumicWeightOfWater
+        {
+            set
+            {
+                wrappedCalculator.VolumicWeightOfWater = value;
+            }
+        }
+
+        public PipingProfile SoilProfile
+        {
+            set
+            {
+                wrappedCalculator.SoilProfile = value;
+            }
+        }
+
+        public PipingSurfaceLine SurfaceLine
+        {
+            set
+            {
+                wrappedCalculator.SurfaceLine = value;
+            }
+        }
+
+        public double EffectiveHeight
+        {
+            get
+            {
+                return wrappedCalculator.EffectiveHeight;
+            }
+        }
+
+        public double EffectiveStress
+        {
+            get
+            {
+                return wrappedCalculator.EffectiveStress;
+            }
+        }
+
+        public void Calculate()
+        {
+            wrappedCalculator.Calculate();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/HeaveCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/HeaveCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/HeaveCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    /// <summary>
+    /// Class which wraps a <see cref="Deltares.WTIPiping.HeaveCalculator"/>.
+    /// </summary>
+    public class HeaveCalculator : IHeaveCalculator
+    {
+        private readonly Deltares.WTIPiping.HeaveCalculator wrappedCalculator;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="HeaveCalculator"/>.
+        /// </summary>
+        public HeaveCalculator()
+        {
+            wrappedCalculator = new Deltares.WTIPiping.HeaveCalculator();
+        }
+
+        public double DTotal
+        {
+            set
+            {
+                wrappedCalculator.DTotal = value;
+            }
+        }
+
+        public double HExit
+        {
+            set
+            {
+                wrappedCalculator.HExit = value;
+            }
+        }
+
+        public double Ich
+        {
+            set
+            {
+                wrappedCalculator.Ich = value;
+            }
+        }
+
+        public double PhiExit
+        {
+            set
+            {
+                wrappedCalculator.PhiExit = value;
+            }
+        }
+
+        public double PhiPolder
+        {
+            set
+            {
+                wrappedCalculator.PhiPolder = value;
+            }
+        }
+
+        public double RExit
+        {
+            set
+            {
+                wrappedCalculator.RExit = value;
+            }
+        }
+
+        public double Zh
+        {
+            get
+            {
+                return wrappedCalculator.Zh;
+            }
+        }
+
+        public double FoSh
+        {
+            get
+            {
+                return wrappedCalculator.FoSh;
+            }
+        }
+
+        public void Calculate()
+        {
+            wrappedCalculator.Calculate();
+        }
+
+        public List<string> Validate()
+        {
+            return wrappedCalculator.Validate();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IEffectiveThicknessCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IEffectiveThicknessCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IEffectiveThicknessCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,47 @@
+using Deltares.WTIPiping;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    public interface IEffectiveThicknessCalculator
+    {
+        /// <summary>
+        /// Sets the ExitPointXCoordinate property of the effective thickness calculation.
+        /// </summary>
+        double ExitPointXCoordinate { set; }
+
+        /// <summary>
+        /// Sets the PhreaticLevel property of the effective thickness calculation.
+        /// </summary>
+        double PhreaticLevel { set; }
+
+        /// <summary>
+        /// Sets the VolumicWeightOfWater property of the effective thickness calculation.
+        /// </summary>
+        double VolumicWeightOfWater { set; }
+
+        /// <summary>
+        /// Sets the SoilProfile property of the effective thickness calculation.
+        /// </summary>
+        PipingProfile SoilProfile { set; }
+
+        /// <summary>
+        /// Sets the SurfaceLine property of the effective thickness calculation.
+        /// </summary>
+        PipingSurfaceLine SurfaceLine { set; }
+
+        /// <summary>
+        /// Gets the EffectiveHeight property of the effective thickness calculation.
+        /// </summary>
+        double EffectiveHeight { get; }
+
+        /// <summary>
+        /// Gets the EffectiveStress property of the effective thickness calculation.
+        /// </summary>
+        double EffectiveStress { get; }
+
+        /// <summary>
+        /// Performs the effective thickness calculation.
+        /// </summary>
+        void Calculate();
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IHeaveCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IHeaveCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IHeaveCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    /// <summary>
+    /// Interface with operations for performing a heave sub calculation.
+    /// </summary>
+    public interface IHeaveCalculator
+    {
+        /// <summary>
+        /// Sets the DTotal property to use in the heave calculation.
+        /// </summary>
+        double DTotal { set; }
+
+        /// <summary>
+        /// Sets the HExit property to use in the heave calculation.
+        /// </summary>
+        double HExit { set; }
+
+        /// <summar>
+        /// Sets the Ich property to use in the heave calculation.
+        /// </summar>
+        double Ich { set; }
+
+        /// <summary>
+        /// Sets the PhiExit property to use in the heave calculation.
+        /// </summary>
+        double PhiExit { set; }
+
+        /// <summary>
+        /// Sets the PhiPolder property to use in the heave calculation.
+        /// </summary>
+        double PhiPolder { set; }
+
+        /// <summary>
+        /// Sets the RExit property to use in the heave calculation.
+        /// </summary>
+        double RExit { set; }
+
+        /// <summary>
+        /// Returns the Zh property to use in the heave calculation.
+        /// </summary>
+        double Zh { get; }
+
+        /// <summary>
+        /// Returns the FoSh property to use in the heave calculation.
+        /// </summary>
+        double FoSh { get; }
+
+        /// <summary>
+        /// Performs the heave calculation.
+        /// </summary>
+        void Calculate();
+
+        /// <summary>
+        /// Performs the heave validation.
+        /// </summary>
+        List<string> Validate();
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IPipingSubCalculatorFactory.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IPipingSubCalculatorFactory.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IPipingSubCalculatorFactory.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,9 @@
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    public interface IPipingSubCalculatorFactory
+    {
+        IUpliftCalculator CreateUpliftCalculator();
+        IHeaveCalculator CreateHeaveCalculator();
+        ISellmeijerCalculator CreateSellmeijerCalculator();
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/ISellmeijerCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/ISellmeijerCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/ISellmeijerCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    /// <summary>
+    /// Interface with operations for performing a sellmeijer sub calculation.
+    /// </summary>
+    public interface ISellmeijerCalculator
+    {
+        /// <summary>
+        /// Sets the BeddingAngle property to use in the Sellmeijer calculation
+        /// </summary>
+        double BeddingAngle { set; }
+
+        /// <summary>
+        /// Sets the D70 to use in the Sellmeijer calculation
+        /// </summary>
+        double D70 { set; }
+
+        /// <summary>
+        /// Sets the D70Mean property to use in the Sellmeijer calculation
+        /// </summary>
+        double D70Mean { set; }
+
+        /// <summary>
+        /// Sets the DAquifer property to use in the Sellmeijer calculation
+        /// </summary>
+        double DAquifer { set; }
+
+        /// <summary>
+        /// Sets the DarcyPermeability property to use in the Sellmeijer calculation
+        /// </summary>
+        double DarcyPermeability { set; }
+
+        /// <summary>
+        /// Sets the DTotal property to use in the Sellmeijer calculation
+        /// </summary>
+        double DTotal { set; }
+
+        /// <summary>
+        /// Sets the GammaSubParticles property to use in the Sellmeijer calculation
+        /// </summary>
+        double GammaSubParticles { set; }
+
+        /// <summary>
+        /// Sets the Gravity property to use in the Sellmeijer calculation
+        /// </summary>
+        double Gravity { set; }
+
+        /// <summary>
+        /// Sets the HExit property to use in the Sellmeijer calculation
+        /// </summary>
+        double HExit { set; }
+
+        /// <summary>
+        /// Sets the HRiver property to use in the Sellmeijer calculation
+        /// </summary>
+        double HRiver { set; }
+
+        /// <summary>
+        /// Sets the KinematicViscosityWater property to use in the Sellmeijer calculation
+        /// </summary>
+        double KinematicViscosityWater { set; }
+
+        /// <summary>
+        /// Sets the ModelFactorPiping property to use in the Sellmeijer calculation
+        /// </summary>
+        double ModelFactorPiping { set; }
+
+        /// <summary>
+        /// Sets the Rc property to use in the Sellmeijer calculation
+        /// </summary>
+        double Rc { set; }
+
+        /// <summary>
+        /// Sets the SeepageLength property to use in the Sellmeijer calculation
+        /// </summary>
+        double SeepageLength { set; }
+
+        /// <summary>
+        /// Sets the VolumetricWeightOfWater property to use in the Sellmeijer calculation
+        /// </summary>
+        double VolumetricWeightOfWater { set; }
+
+        /// <summary>
+        /// Sets the WhitesDragCoefficient property to use in the Sellmeijer calculation
+        /// </summary>
+        double WhitesDragCoefficient { set; }
+
+        /// <summary>
+        /// Gets the Zp property of the Sellmeijer calculation.
+        /// </summary>
+        double Zp { get; }
+
+        /// <summary>
+        /// Gets the FoSp property of the Sellmeijer calculation.
+        /// </summary>
+        double FoSp { get; }
+
+        /// <summary>
+        /// Performs the Sellmeijer calculation.
+        /// </summary>
+        void Calculate();
+
+        /// <summary>
+        /// Performs the Sellmeijer validation.
+        /// </summary>
+        List<string> Validate();
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IUpliftCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IUpliftCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/IUpliftCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    public interface IUpliftCalculator
+    {
+        /// <summary>
+        /// Sets the EffectiveStress property to use in the uplift calculation
+        /// </summary>
+        double EffectiveStress { set; }
+
+        /// <summary>
+        /// Sets the HExit property to use in the uplift calculation
+        /// </summary>
+        double HExit { set; }
+
+        /// <summary>
+        /// Sets the HRiver property to use in the uplift calculation
+        /// </summary>
+        double HRiver { set; }
+
+        /// <summary>
+        /// Sets the ModelFactorUplift property to use in the uplift calculation
+        /// </summary>
+        double ModelFactorUplift { set; }
+
+        /// <summary>
+        /// Sets the PhiExit property to use in the uplift calculation
+        /// </summary>
+        double PhiExit { set; }
+
+        /// <summary>
+        /// Sets the PhiPolder property to use in the uplift calculation
+        /// </summary>
+        double PhiPolder { set; }
+
+        /// <summary>
+        /// Sets the RExit property to use in the uplift calculation
+        /// </summary>
+        double RExit { set; }
+
+        /// <summary>
+        /// Sets the VolumetricWeightOfWater property to use in the uplift calculation
+        /// </summary>
+        double VolumetricWeightOfWater { set; }
+
+        /// <summary>
+        /// Gets the Zu property of the uplift calculation
+        /// </summary>
+        double Zu { get; }
+
+        /// <summary>
+        /// Gets the FoSu property of the uplift calculation
+        /// </summary>
+        double FoSu { get; }
+
+        /// <summary>
+        /// Performs the uplift validation.
+        /// </summary>
+        void Calculate();
+
+        /// <summary>
+        /// Performs the uplift validation.
+        /// </summary>
+        List<string> Validate();
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/SellmeijerCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/SellmeijerCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/SellmeijerCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,175 @@
+using System.Collections.Generic;
+using Deltares.WTIPiping;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    /// <summary>
+    /// Class which wraps a <see cref="Sellmeijer2011Calculator"/>.
+    /// </summary>
+    public class SellmeijerCalculator : ISellmeijerCalculator
+    {
+        private readonly Sellmeijer2011Calculator wrappedCalculator;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="SellmeijerCalculator"/>
+        /// </summary>
+        public SellmeijerCalculator()
+        {
+            wrappedCalculator = new Sellmeijer2011Calculator();
+        }
+
+        public double BeddingAngle
+        {
+            set
+            {
+                wrappedCalculator.BeddingAngle = value;
+            }
+        }
+
+        public double D70
+        {
+            set
+            {
+                wrappedCalculator.D70 = value;
+            }
+        }
+
+        public double D70Mean
+        {
+            set
+            {
+                wrappedCalculator.D70Mean = value;
+            }
+        }
+
+        public double DAquifer
+        {
+            set
+            {
+                wrappedCalculator.DAquifer = value;
+            }
+        }
+
+        public double DarcyPermeability
+        {
+            set
+            {
+                wrappedCalculator.DarcyPermeability = value;
+            }
+        }
+
+        public double DTotal
+        {
+            set
+            {
+                wrappedCalculator.DTotal = value;
+            }
+        }
+
+        public double GammaSubParticles
+        {
+            set
+            {
+                wrappedCalculator.GammaSubParticles = value;
+            }
+        }
+
+        public double Gravity
+        {
+            set
+            {
+                wrappedCalculator.Gravity = value;
+            }
+        }
+
+        public double HExit
+        {
+            set
+            {
+                wrappedCalculator.HExit = value;
+            }
+        }
+
+        public double HRiver
+        {
+            set
+            {
+                wrappedCalculator.HRiver = value;
+            }
+        }
+
+        public double KinematicViscosityWater
+        {
+            set
+            {
+                wrappedCalculator.KinematicViscosityWater = value;
+            }
+        }
+
+        public double ModelFactorPiping
+        {
+            set
+            {
+                wrappedCalculator.ModelFactorPiping = value;
+            }
+        }
+
+        public double Rc
+        {
+            set
+            {
+                wrappedCalculator.Rc = value;
+            }
+        }
+
+        public double SeepageLength
+        {
+            set
+            {
+                wrappedCalculator.SeepageLength = value;
+            }
+        }
+
+        public double VolumetricWeightOfWater
+        {
+            set
+            {
+                wrappedCalculator.VolumetricWeightOfWater = value;
+            }
+        }
+
+        public double WhitesDragCoefficient
+        {
+            set
+            {
+                wrappedCalculator.WhitesDragCoefficient = value;
+            }
+        }
+
+        public double Zp
+        {
+            get
+            {
+                return wrappedCalculator.Zp;
+            }
+        }
+
+        public double FoSp
+        {
+            get
+            {
+                return wrappedCalculator.FoSp;
+            }
+        }
+
+        public void Calculate()
+        {
+            wrappedCalculator.Calculate();
+        }
+
+        public List<string> Validate()
+        {
+            return wrappedCalculator.Validate();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/UpliftCalculator.cs
===================================================================
diff -u
--- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/UpliftCalculator.cs	(revision 0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/SubCalculator/UpliftCalculator.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using Deltares.WTIPiping;
+
+namespace Ringtoets.Piping.Calculation.SubCalculator
+{
+    /// <summary>
+    /// Class which wraps a <see cref="WTIUpliftCalculator"/>.
+    /// </summary>
+    public class UpliftCalculator : IUpliftCalculator
+    {
+        private readonly WTIUpliftCalculator wrappedCalculator;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="UpliftCalculator"/>
+        /// </summary>
+        public UpliftCalculator()
+        {
+            wrappedCalculator = new WTIUpliftCalculator();
+        }
+
+        public double EffectiveStress
+        {
+            set
+            {
+                wrappedCalculator.EffectiveStress = value;
+            }
+        }
+
+        public double HExit
+        {
+            set
+            {
+                wrappedCalculator.HExit = value;
+            }
+        }
+
+        public double HRiver
+        {
+            set
+            {
+                wrappedCalculator.HRiver = value;
+            }
+        }
+
+        public double ModelFactorUplift
+        {
+            set
+            {
+                wrappedCalculator.ModelFactorUplift = value;
+            }
+        }
+
+        public double PhiExit
+        {
+            set
+            {
+                wrappedCalculator.PhiExit = value;
+            }
+        }
+
+        public double PhiPolder
+        {
+            set
+            {
+                wrappedCalculator.PhiPolder = value;
+            }
+        }
+
+        public double RExit
+        {
+            set
+            {
+                wrappedCalculator.RExit = value;
+            }
+        }
+
+        public double VolumetricWeightOfWater
+        {
+            set
+            {
+                wrappedCalculator.VolumetricWeightOfWater = value;
+            }
+        }
+
+        public double Zu
+        {
+            get
+            {
+                return wrappedCalculator.Zu;
+            }
+        }
+
+        public double FoSu
+        {
+            get
+            {
+                return wrappedCalculator.FoSu;
+            }
+        }
+
+        public void Calculate()
+        {
+            wrappedCalculator.Calculate();
+        }
+
+        public List<string> Validate()
+        {
+            return wrappedCalculator.Validate();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/Ringtoets.Piping.Calculation.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -ra2675f58f4d57204df1b8378e9dc1134cd11186e
--- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/Ringtoets.Piping.Calculation.Test.csproj	(.../Ringtoets.Piping.Calculation.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/Ringtoets.Piping.Calculation.Test.csproj	(.../Ringtoets.Piping.Calculation.Test.csproj)	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -60,14 +60,23 @@
     <Compile Include="PipingProfileCreatorExceptionTest.cs" />
     <Compile Include="PipingProfileCreatorTest.cs" />
     <Compile Include="PipingSemiProbabilisticDesignValueFactoryTest.cs" />
+    <Compile Include="SubCalculator\EffectiveThicknessCalculatorTest.cs" />
+    <Compile Include="SubCalculator\HeaveCalculatorTest.cs" />
+    <Compile Include="SubCalculator\PipingSubCalculatorFactoryTest.cs" />
     <Compile Include="PipingSurfaceLineCreatorTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SubCalculator\SellmeijerCalculatorTest.cs" />
+    <Compile Include="SubCalculator\UpliftCalculatorTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Piping.Data\Ringtoets.Piping.Data.csproj">
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
       <Name>Ringtoets.Piping.Data</Name>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/EffectiveThicknessCalculatorTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/EffectiveThicknessCalculatorTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/EffectiveThicknessCalculatorTest.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,23 @@
+using System;
+using NUnit.Framework;
+using Ringtoets.Piping.Calculation.SubCalculator;
+
+namespace Ringtoets.Piping.Calculation.Test.SubCalculator
+{
+    [TestFixture]
+    public class EffectiveThicknessCalculatorTest
+    {
+        [Test]
+        public void Constructor_WithInput_PropertiesThrowNullReferenceException()
+        {
+            // Call
+            var calculator = new EffectiveThicknessCalculator();
+
+            // Assert
+            Assert.IsInstanceOf<IEffectiveThicknessCalculator>(calculator);
+
+            Assert.Throws<NullReferenceException>(() => { var x = calculator.EffectiveHeight; });
+            Assert.Throws<NullReferenceException>(() => { var x = calculator.EffectiveStress; });
+        } 
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/HeaveCalculatorTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/HeaveCalculatorTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/HeaveCalculatorTest.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,20 @@
+using NUnit.Framework;
+using Ringtoets.Piping.Calculation.SubCalculator;
+
+namespace Ringtoets.Piping.Calculation.Test.SubCalculator
+{
+    [TestFixture]
+    public class HeaveCalculatorTest
+    {
+        [Test]
+        public void Constructor_WithInput_PropertiesSet()
+        {
+            // Call
+            var calculator = new HeaveCalculator();
+
+            // Assert
+            Assert.IsInstanceOf<IHeaveCalculator>(calculator);
+            Assert.AreEqual(0.0, calculator.Zh);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/PipingSubCalculatorFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/PipingSubCalculatorFactoryTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/PipingSubCalculatorFactoryTest.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,19 @@
+using NUnit.Framework;
+
+namespace Ringtoets.Piping.Calculation.Test.SubCalculator
+{
+    [TestFixture]
+    public class PipingSubCalculatorFactoryTest
+    {
+        [Test]
+        public void CreateHeaveCalculator_WithInput_CreatesHeaveCalculatorInstance()
+        {
+            // Setup
+
+            // Call
+
+            // Assert
+
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/SellmeijerCalculatorTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/SellmeijerCalculatorTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/SellmeijerCalculatorTest.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,20 @@
+using NUnit.Framework;
+using Ringtoets.Piping.Calculation.SubCalculator;
+
+namespace Ringtoets.Piping.Calculation.Test.SubCalculator
+{
+    [TestFixture]
+    public class SellmeijerCalculatorTest
+    {
+        [Test]
+        public void Constructor_DefaultValues()
+        {
+            // Call
+            var calculator = new SellmeijerCalculator();
+
+            // Assert
+            Assert.IsInstanceOf<ISellmeijerCalculator>(calculator);
+            Assert.AreEqual(0.0, calculator.Zp);
+        } 
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/UpliftCalculatorTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/UpliftCalculatorTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Calculation.Test/SubCalculator/UpliftCalculatorTest.cs	(revision a2675f58f4d57204df1b8378e9dc1134cd11186e)
@@ -0,0 +1,20 @@
+using NUnit.Framework;
+using Ringtoets.Piping.Calculation.SubCalculator;
+
+namespace Ringtoets.Piping.Calculation.Test.SubCalculator
+{
+    [TestFixture]
+    public class UpliftCalculatorTest
+    {
+        [Test]
+        public void Constructor_DefaultValues()
+        {
+            // Call
+            var calculator = new UpliftCalculator();
+
+            // Assert
+            Assert.IsInstanceOf<IUpliftCalculator>(calculator);
+            Assert.AreEqual(double.NaN, calculator.Zu);
+        }  
+    }
+}
\ No newline at end of file