Index: Ringtoets.sln
===================================================================
diff -u -r14c118039f313ea66787d8065daad0aa783b731a -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -1741,11 +1741,6 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.MacroStabilityInwards.Service.TestUtil", "Ringtoets\MacroStabilityInwards\test\Ringtoets.MacroStabilityInwards.Service.TestUtil\Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj", "{F966AE28-DE6B-497A-8449-37EC607E9F69}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.IO.TestUtil", "Ringtoets\Piping\test\Ringtoets.Piping.IO.TestUtil\Ringtoets.Piping.IO.TestUtil.csproj", "{58E2D4FD-9DFA-4A05-99C6-5A2E8ADCF90A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
@@ -1786,6 +1781,11 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil", "Ringtoets\MacroStabilityInwards\test\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj", "{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CreateInstaller|x86 = CreateInstaller|x86
@@ -4434,14 +4434,6 @@
 		{D1234D03-76BC-437D-B941-DFF14A2A108D}.Release|x86.Build.0 = Release|x86
 		{D1234D03-76BC-437D-B941-DFF14A2A108D}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{D1234D03-76BC-437D-B941-DFF14A2A108D}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.Debug|x86.ActiveCfg = Debug|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.Debug|x86.Build.0 = Debug|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.Release|x86.ActiveCfg = Release|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.Release|x86.Build.0 = Release|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{F966AE28-DE6B-497A-8449-37EC607E9F69}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 		{58E2D4FD-9DFA-4A05-99C6-5A2E8ADCF90A}.CreateInstaller|x86.ActiveCfg = Release|x86
 		{58E2D4FD-9DFA-4A05-99C6-5A2E8ADCF90A}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{58E2D4FD-9DFA-4A05-99C6-5A2E8ADCF90A}.Debug|x86.ActiveCfg = Debug|x86
@@ -4492,26 +4484,30 @@
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E}.Release|x86.Build.0 = Release|x86
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstaller|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstaller|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstallerWithDemoProject|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstallerWithDemoProject|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstaller|x86.ActiveCfg = Release|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Debug|x86.ActiveCfg = Debug|x86
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Debug|x86.Build.0 = Debug|x86
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Release|x86.ActiveCfg = Release|x86
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Release|x86.Build.0 = Release|x86
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstaller|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstaller|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstallerWithDemoProject|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstallerWithDemoProject|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstaller|x86.ActiveCfg = Release|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{C80AD710-0F84-40CE-9567-10CBE332E589}.Debug|x86.ActiveCfg = Debug|x86
 		{C80AD710-0F84-40CE-9567-10CBE332E589}.Debug|x86.Build.0 = Debug|x86
 		{C80AD710-0F84-40CE-9567-10CBE332E589}.Release|x86.ActiveCfg = Release|x86
 		{C80AD710-0F84-40CE-9567-10CBE332E589}.Release|x86.Build.0 = Release|x86
 		{C80AD710-0F84-40CE-9567-10CBE332E589}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{C80AD710-0F84-40CE-9567-10CBE332E589}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.CreateInstaller|x86.ActiveCfg = Release|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.Debug|x86.ActiveCfg = Debug|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.Debug|x86.Build.0 = Debug|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.Release|x86.ActiveCfg = Release|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.Release|x86.Build.0 = Release|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4885,7 +4881,6 @@
 		{B727E93A-74B2-467A-AE46-9A4E39ED4B5F} = {41023317-95BB-4147-8154-87B45837E752}
 		{0FBC0EA1-89AA-4E34-A8A7-C04A3B866CE7} = {69B95FED-E2DF-42E8-BF6E-8A94EFACD2DC}
 		{D1234D03-76BC-437D-B941-DFF14A2A108D} = {2B6156FD-080B-4869-B148-E4A2995F0EFB}
-		{F966AE28-DE6B-497A-8449-37EC607E9F69} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 		{58E2D4FD-9DFA-4A05-99C6-5A2E8ADCF90A} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{28665A2A-9B74-4297-977B-00A8619AF2EE} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{C83B2091-339A-4F35-A874-A4C807F55CAE} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
@@ -4894,6 +4889,7 @@
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 		{C80AD710-0F84-40CE-9567-10CBE332E589} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
+		{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 	EndGlobalSection
 	GlobalSection(TextTemplating) = postSolution
 		TextTemplating = 1
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/DrainageConstructionConverter.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/DrainageConstructionConverter.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/DrainageConstructionConverter.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. 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 Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Converters
+{
+    /// <summary>
+    /// Converter to convert <see cref="IMacroStabilityInwardsWaternetInput"/> drainage properties
+    /// into <see cref="DrainageConstruction"/>.
+    /// </summary>
+    public static class DrainageConstructionConverter
+    {
+        /// <summary>
+        /// Converts <see cref="IMacroStabilityInwardsWaternetInput"/> drainage properties
+        /// into <see cref="DrainageConstruction"/>.
+        /// </summary>
+        /// <param name="input">The input to get the properties from.</param>
+        /// <returns>The converted <see cref="DrainageConstruction"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="input"/>
+        /// is <c>null</c>.</exception>
+        public static DrainageConstruction Convert(IMacroStabilityInwardsWaternetInput input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            bool isClayDike = input.DikeSoilScenario == MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay
+                              || input.DikeSoilScenario == MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand;
+
+            return !isClayDike && input.DrainageConstructionPresent
+                       ? new DrainageConstruction(input.XCoordinateDrainageConstruction, input.ZCoordinateDrainageConstruction)
+                       : new DrainageConstruction();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/PhreaticLineOffsetsConverter.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/PhreaticLineOffsetsConverter.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/PhreaticLineOffsetsConverter.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. 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 Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Converters
+{
+    /// <summary>
+    /// Converter to convert <see cref="IMacroStabilityInwardsLocationInput"/> phreatic line offset properties
+    /// into <see cref="PhreaticLineOffsets"/>.
+    /// </summary>
+    public static class PhreaticLineOffsetsConverter
+    {
+        /// <summary>
+        /// Converts <see cref="IMacroStabilityInwardsLocationInput"/> phreatic line offset properties
+        /// into <see cref="PhreaticLineOffsets"/>.
+        /// </summary>
+        /// <param name="input">The input to get the properties from.</param>
+        /// <returns>The converted <see cref="PhreaticLineOffsets"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="input"/>
+        /// is <c>null</c>.</exception>
+        public static PhreaticLineOffsets Convert(IMacroStabilityInwardsLocationInput input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            return input.UseDefaultOffsets
+                       ? new PhreaticLineOffsets()
+                       : new PhreaticLineOffsets(input.PhreaticLineOffsetBelowDikeTopAtRiver,
+                                                 input.PhreaticLineOffsetBelowDikeTopAtPolder,
+                                                 input.PhreaticLineOffsetBelowDikeToeAtPolder,
+                                                 input.PhreaticLineOffsetBelowShoulderBaseInside);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,139 @@
+// Copyright (C) Stichting Deltares 2017. 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 System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Converters
+{
+    /// <summary>
+    /// Converter to convert <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
+    /// into <see cref="SoilProfile"/>.
+    /// </summary>
+    public static class SoilProfileConverter
+    {
+        /// <summary>
+        /// Converts <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
+        /// into <see cref="SoilProfile"/>.
+        /// </summary>
+        /// <param name="soilProfile">The soil profile to convert.</param>
+        /// <returns>The converted <see cref="SoilProfile"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilProfile"/>
+        /// is <c>null</c>.</exception>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when 
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when 
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// is a valid value but unsupported.</exception>
+        public static SoilProfile Convert(IMacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfile)
+        {
+            if (soilProfile == null)
+            {
+                throw new ArgumentNullException(nameof(soilProfile));
+            }
+
+            IEnumerable<SoilLayer> layers = ConvertLayers(soilProfile.Layers);
+            IEnumerable<PreconsolidationStress> preconsolidationStresses = ConvertPreconsolidationStresses(soilProfile.PreconsolidationStresses);
+
+            return new SoilProfile(layers, preconsolidationStresses);
+        }
+
+        /// <summary>
+        /// Converts <see cref="IMacroStabilityInwardsSoilLayerData"/>
+        /// into <see cref="SoilLayer"/>.
+        /// </summary>
+        /// <param name="layers">The layers to convert.</param>
+        /// <returns>The converted <see cref="SoilLayer"/>.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when 
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when 
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// is a valid value but unsupported.</exception>
+        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<IMacroStabilityInwardsSoilLayerUnderSurfaceLine> layers)
+        {
+            return layers.Select(l =>
+            {
+                IMacroStabilityInwardsSoilLayerData data = l.Data;
+                return new SoilLayer(l.OuterRing, l.Holes, new SoilLayer.ConstructionProperties
+                {
+                    MaterialName = data.MaterialName,
+                    UsePop = data.UsePop,
+                    IsAquifer = data.IsAquifer,
+                    ShearStrengthModel = ConvertShearStrengthModel(data.ShearStrengthModel),
+                    AbovePhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(data).GetDesignValue(),
+                    BelowPhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(data).GetDesignValue(),
+                    Cohesion = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(data).GetDesignValue(),
+                    FrictionAngle = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(data).GetDesignValue(),
+                    ShearStrengthRatio = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(data).GetDesignValue(),
+                    StrengthIncreaseExponent = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(data).GetDesignValue(),
+                    Pop = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(data).GetDesignValue(),
+                    DilatancyType = DilatancyType.Zero,
+                    WaterPressureInterpolationModel = WaterPressureInterpolationModel.Automatic
+                });
+            }).ToArray();
+        }
+
+        private static IEnumerable<PreconsolidationStress> ConvertPreconsolidationStresses(
+            IEnumerable<IMacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
+        {
+            return preconsolidationStresses.Select(ps => new PreconsolidationStress(
+                                                       ps.Location,
+                                                       MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(ps).GetDesignValue()));
+        }
+
+        /// <summary>
+        /// Converts a <see cref="MacroStabilityInwardsShearStrengthModel"/> to a <see cref="ShearStrengthModel"/>.
+        /// </summary>
+        /// <param name="shearStrengthModel">The <see cref="MacroStabilityInwardsShearStrengthModel"/> to convert.</param>
+        /// <returns>A <see cref="ShearStrengthModel"/> based on the information of <paramref name="shearStrengthModel"/>.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="shearStrengthModel"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="shearStrengthModel"/>
+        /// is a valid value but unsupported.</exception>
+        private static ShearStrengthModel ConvertShearStrengthModel(MacroStabilityInwardsShearStrengthModel shearStrengthModel)
+        {
+            if (!Enum.IsDefined(typeof(MacroStabilityInwardsShearStrengthModel), shearStrengthModel))
+            {
+                throw new InvalidEnumArgumentException(nameof(shearStrengthModel),
+                                                       (int) shearStrengthModel,
+                                                       typeof(MacroStabilityInwardsShearStrengthModel));
+            }
+
+            switch (shearStrengthModel)
+            {
+                case MacroStabilityInwardsShearStrengthModel.SuCalculated:
+                    return ShearStrengthModel.SuCalculated;
+                case MacroStabilityInwardsShearStrengthModel.CPhi:
+                    return ShearStrengthModel.CPhi;
+                case MacroStabilityInwardsShearStrengthModel.CPhiOrSuCalculated:
+                    return ShearStrengthModel.CPhiOrSuCalculated;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj
===================================================================
diff -u -rb97a663a2997575c7c2cdabc4172866b4e6597f3 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.csproj)	(revision b97a663a2997575c7c2cdabc4172866b4e6597f3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -40,6 +40,9 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="Converters\DrainageConstructionConverter.cs" />
+    <Compile Include="Converters\PhreaticLineOffsetsConverter.cs" />
+    <Compile Include="Converters\SoilProfileConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WaternetCalculationService.cs" />
   </ItemGroup>
@@ -48,6 +51,28 @@
       <Link>Copying.licenseheader</Link>
     </None>
   </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>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
+      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
+      <Name>Ringtoets.Common.Data</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.KernelWrapper\Ringtoets.MacroStabilityInwards.KernelWrapper.csproj">
+      <Project>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
+      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj
===================================================================
diff -u -r90a9502badff5788374461a1b2179a5dd0e866a2 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -53,7 +53,6 @@
     <Compile Include="MacroStabilityInwardsLocationInputExtreme.cs" />
     <Compile Include="MacroStabilityInwardsLocationInputDaily.cs" />
     <Compile Include="MacroStabilityInwardsOutput.cs" />
-    <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs" />
     <Compile Include="MacroStabilityInwardsSemiProbabilisticOutput.cs" />
     <Compile Include="MacroStabilityInwardsSlice.cs" />
     <Compile Include="MacroStabilityInwardsSlidingCircle.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPreconsolidationStressProperties.cs
===================================================================
diff -u -r873135f4919536e5d4d6e50e0a838be8b8b00fd4 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPreconsolidationStressProperties.cs	(.../MacroStabilityInwardsPreconsolidationStressProperties.cs)	(revision 873135f4919536e5d4d6e50e0a838be8b8b00fd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPreconsolidationStressProperties.cs	(.../MacroStabilityInwardsPreconsolidationStressProperties.cs)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -25,9 +25,9 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,119 @@
+// Copyright (C) Stichting Deltares 2017. 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 Ringtoets.Common.Data.Probabilistics;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Factory for creating design variables based on probabilistic distributions for macro stability.
+    /// </summary>
+    public static class MacroStabilityInwardsSemiProbabilisticDesignVariableFactory
+    {
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.AbovePhreaticLevel"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetAbovePhreaticLevel(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.AbovePhreaticLevel)
+            {
+                Percentile = 0.5
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.BelowPhreaticLevel"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetBelowPhreaticLevel(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.BelowPhreaticLevel)
+            {
+                Percentile = 0.5
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.Cohesion"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetCohesion(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.Cohesion)
+            {
+                Percentile = 0.05
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.FrictionAngle"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetFrictionAngle(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.FrictionAngle)
+            {
+                Percentile = 0.05
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthRatio"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetShearStrengthRatio(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.ShearStrengthRatio)
+            {
+                Percentile = 0.05
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.StrengthIncreaseExponent"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetStrengthIncreaseExponent(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.StrengthIncreaseExponent)
+            {
+                Percentile = 0.05
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.Pop"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetPop(IMacroStabilityInwardsSoilLayerData data)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(data.Pop)
+            {
+                Percentile = 0.05
+            };
+        }
+
+        /// <summary>
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsPreconsolidationStress"/>.
+        /// </summary>
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetPreconsolidationStress(IMacroStabilityInwardsPreconsolidationStress preconsolidationStressUnderSurfaceLine)
+        {
+            return new VariationCoefficientLogNormalDistributionDesignVariable(preconsolidationStressUnderSurfaceLine.Stress)
+            {
+                Percentile = 0.05
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r90a9502badff5788374461a1b2179a5dd0e866a2 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -52,6 +52,7 @@
     <Compile Include="IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs" />
     <Compile Include="MacroStabilityInwardsDikeSoilScenario.cs" />
     <Compile Include="MacroStabilityInwardsPhreaticLine.cs" />
+    <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs" />
     <Compile Include="MacroStabilityInwardsShearStrengthModel.cs" />
     <Compile Include="MacroStabilityInwardsWaternet.cs" />
     <Compile Include="MacroStabilityInwardsWaternetLine.cs" />
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/DrainageConstructionConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/PhreaticLineOffsetsConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -r457252870eff6f6c559976ae2a479112b5754bec -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 457252870eff6f6c559976ae2a479112b5754bec)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -24,6 +24,7 @@
 using System.Linq;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.ValidationRules;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.Converters;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj	(.../Ringtoets.MacroStabilityInwards.Service.csproj)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj	(.../Ringtoets.MacroStabilityInwards.Service.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -41,10 +41,7 @@
     </Compile>
     <Compile Include="Converters\MacroStabilityInwardsSlidingCurveConverter.cs" />
     <Compile Include="Converters\MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs" />
-    <Compile Include="Converters\DrainageConstructionConverter.cs" />
-    <Compile Include="Converters\PhreaticLineOffsetsConverter.cs" />
     <Compile Include="Converters\UpliftVanSlipPlaneConverter.cs" />
-    <Compile Include="Converters\SoilProfileConverter.cs" />
     <Compile Include="MacroStabilityInwardsCalculationActivity.cs" />
     <Compile Include="MacroStabilityInwardsCalculationService.cs" />
     <Compile Include="MacroStabilityInwardsDataSynchronizationService.cs" />
@@ -83,6 +80,11 @@
       <Name>Ringtoets.Common.Service</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.CalculatedInput\Ringtoets.MacroStabilityInwards.CalculatedInput.csproj">
+      <Project>{d0887613-858e-4eed-9320-8c5a09170761}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.CalculatedInput</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
       <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data</Name>
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/DrainageConstructionConverterTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/DrainageConstructionConverterTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/DrainageConstructionConverterTest.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,115 @@
+// Copyright (C) Stichting Deltares 2017. 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 Ringtoets.MacroStabilityInwards.CalculatedInput.Converters;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Test.Converters
+{
+    [TestFixture]
+    public class DrainageConstructionConverterTest
+    {
+        [Test]
+        public void Convert_InputNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => DrainageConstructionConverter.Convert(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("input", exception.ParamName);
+        }
+
+        [Test]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay)]
+        public void Convert_SandDikeAndDrainageConstructionPresentTrue_ReturnUpliftVanDrainageConstruction(MacroStabilityInwardsDikeSoilScenario soilScenario)
+        {
+            // Setup
+            var input = new MacroStabilityInwardsInput
+            {
+                DrainageConstructionPresent = true,
+                XCoordinateDrainageConstruction = (RoundedDouble) 2,
+                ZCoordinateDrainageConstruction = (RoundedDouble) 4,
+                DikeSoilScenario = soilScenario
+            };
+
+            // Call
+            DrainageConstruction drainageConstruction = DrainageConstructionConverter.Convert(input);
+
+            // Assert
+            Assert.IsTrue((bool) drainageConstruction.IsPresent);
+            Assert.AreEqual(input.XCoordinateDrainageConstruction, drainageConstruction.XCoordinate);
+            Assert.AreEqual(input.ZCoordinateDrainageConstruction, drainageConstruction.ZCoordinate);
+        }
+
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay)]
+        public void Convert_DrainageConstructionPresentFalse_ReturnUpliftVanDrainageConstruction(MacroStabilityInwardsDikeSoilScenario soilScenario)
+        {
+            // Setup
+            var input = new MacroStabilityInwardsInput
+            {
+                DrainageConstructionPresent = false,
+                XCoordinateDrainageConstruction = (RoundedDouble) 2,
+                ZCoordinateDrainageConstruction = (RoundedDouble) 4,
+                DikeSoilScenario = soilScenario
+            };
+
+            // Call
+            DrainageConstruction drainageConstruction = DrainageConstructionConverter.Convert(input);
+
+            // Assert
+            Assert.IsFalse((bool) drainageConstruction.IsPresent);
+            Assert.IsNaN((double) drainageConstruction.XCoordinate);
+            Assert.IsNaN((double) drainageConstruction.ZCoordinate);
+        }
+
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay)]
+        public void Convert_ClayDikeAndDrainageConstructionPresentTrue_ReturnUpliftVanDrainageConstruction(MacroStabilityInwardsDikeSoilScenario soilScenario)
+        {
+            // Setup
+            var input = new MacroStabilityInwardsInput
+            {
+                DrainageConstructionPresent = true,
+                XCoordinateDrainageConstruction = (RoundedDouble) 2,
+                ZCoordinateDrainageConstruction = (RoundedDouble) 4,
+                DikeSoilScenario = soilScenario
+            };
+
+            // Call
+            DrainageConstruction drainageConstruction = DrainageConstructionConverter.Convert(input);
+
+            // Assert
+            Assert.IsFalse((bool) drainageConstruction.IsPresent);
+            Assert.IsNaN((double) drainageConstruction.XCoordinate);
+            Assert.IsNaN((double) drainageConstruction.ZCoordinate);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/PhreaticLineOffsetsConverterTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/PhreaticLineOffsetsConverterTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/PhreaticLineOffsetsConverterTest.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,95 @@
+// Copyright (C) Stichting Deltares 2017. 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.TestUtil;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.Converters;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Test.Converters
+{
+    [TestFixture]
+    public class PhreaticLineOffsetsConverterTest
+    {
+        [Test]
+        public void Convert_InputNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => PhreaticLineOffsetsConverter.Convert(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("input", exception.ParamName);
+        }
+
+        [Test]
+        public void Convert_UseDefaultOffsetsTrue_ReturnUpliftVanPhreaticLineOffsets()
+        {
+            // Setup
+            var random = new Random(11);
+            var input = new MacroStabilityInwardsLocationInputExtreme
+            {
+                UseDefaultOffsets = true,
+                PhreaticLineOffsetBelowDikeTopAtRiver = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeTopAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeToeAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowShoulderBaseInside = random.NextRoundedDouble()
+            };
+
+            // Call
+            PhreaticLineOffsets offsets = PhreaticLineOffsetsConverter.Convert(input);
+
+            // Assert
+            Assert.IsTrue((bool) offsets.UseDefaults);
+            Assert.IsNaN((double) offsets.BelowDikeTopAtRiver);
+            Assert.IsNaN((double) offsets.BelowDikeTopAtPolder);
+            Assert.IsNaN((double) offsets.BelowDikeToeAtPolder);
+            Assert.IsNaN((double) offsets.BelowShoulderBaseInside);
+        }
+
+        [Test]
+        public void Convert_UseDefaultOffsetsFalse_ReturnUpliftVanPhreaticLineOffsets()
+        {
+            // Setup
+            var random = new Random(11);
+            var input = new MacroStabilityInwardsLocationInputExtreme
+            {
+                UseDefaultOffsets = false,
+                PhreaticLineOffsetBelowDikeTopAtRiver = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeTopAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowDikeToeAtPolder = random.NextRoundedDouble(),
+                PhreaticLineOffsetBelowShoulderBaseInside = random.NextRoundedDouble()
+            };
+
+            // Call
+            PhreaticLineOffsets offsets = PhreaticLineOffsetsConverter.Convert(input);
+
+            // Assert
+            Assert.IsFalse((bool) offsets.UseDefaults);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowDikeTopAtRiver, offsets.BelowDikeTopAtRiver);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowDikeTopAtPolder, offsets.BelowDikeTopAtPolder);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowDikeToeAtPolder, offsets.BelowDikeToeAtPolder);
+            Assert.AreEqual(input.PhreaticLineOffsetBelowShoulderBaseInside, offsets.BelowShoulderBaseInside);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,191 @@
+// Copyright (C) Stichting Deltares 2017. 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 System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.Converters;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil;
+using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Test.Converters
+{
+    [TestFixture]
+    public class SoilProfileConverterTest
+    {
+        [Test]
+        public void Convert_SoilProfileNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => SoilProfileConverter.Convert(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("soilProfile", exception.ParamName);
+        }
+
+        [Test]
+        public void Convert_WithSoilProfile_ReturnUpliftVanSoilProfile()
+        {
+            // Setup
+            var random = new Random(22);
+
+            var profile = new MacroStabilityInwardsSoilProfileUnderSurfaceLine(new[]
+            {
+                new MacroStabilityInwardsSoilLayerUnderSurfaceLine(CreateRing(21), new List<Point2D[]>
+                {
+                    CreateRing(11),
+                    CreateRing(22)
+                }, new MacroStabilityInwardsSoilLayerData
+                {
+                    UsePop = random.NextBoolean(),
+                    IsAquifer = random.NextBoolean(),
+                    MaterialName = "Test",
+                    AbovePhreaticLevel =
+                    {
+                        Mean = (RoundedDouble) 10,
+                        CoefficientOfVariation = (RoundedDouble) 0.3,
+                        Shift = (RoundedDouble) 0.1
+                    },
+                    BelowPhreaticLevel =
+                    {
+                        Mean = (RoundedDouble) 5,
+                        CoefficientOfVariation = (RoundedDouble) 0.8,
+                        Shift = (RoundedDouble) 0.3
+                    },
+                    Cohesion =
+                    {
+                        Mean = random.NextRoundedDouble(),
+                        CoefficientOfVariation = random.NextRoundedDouble()
+                    },
+                    FrictionAngle =
+                    {
+                        Mean = random.NextRoundedDouble(),
+                        CoefficientOfVariation = random.NextRoundedDouble()
+                    },
+                    StrengthIncreaseExponent =
+                    {
+                        Mean = random.NextRoundedDouble(),
+                        CoefficientOfVariation = random.NextRoundedDouble()
+                    },
+                    ShearStrengthRatio =
+                    {
+                        Mean = random.NextRoundedDouble(),
+                        CoefficientOfVariation = random.NextRoundedDouble()
+                    },
+                    Pop =
+                    {
+                        Mean = random.NextRoundedDouble(),
+                        CoefficientOfVariation = random.NextRoundedDouble()
+                    }
+                })
+            }, new[]
+            {
+                new MacroStabilityInwardsPreconsolidationStress(new Point2D(random.NextDouble(), random.NextDouble()),
+                                                                new VariationCoefficientLogNormalDistribution
+                                                                {
+                                                                    Mean = (RoundedDouble) 0.05,
+                                                                    CoefficientOfVariation = random.NextRoundedDouble()
+                                                                })
+            });
+
+            // Call
+            SoilProfile soilProfile = SoilProfileConverter.Convert(profile);
+
+            // Assert
+            UpliftVanCalculatorInputAssert.AssertSoilProfile(profile, soilProfile);
+        }
+
+        [Test]
+        public void Convert_InvalidShearStrengthModel_ThrowInvalidEnumArgumentException()
+        {
+            // Setup
+            var profile = new MacroStabilityInwardsSoilProfileUnderSurfaceLine(new[]
+            {
+                new MacroStabilityInwardsSoilLayerUnderSurfaceLine(CreateRing(21), new Point2D[0][],
+                                                                   new MacroStabilityInwardsSoilLayerData
+                                                                   {
+                                                                       ShearStrengthModel = (MacroStabilityInwardsShearStrengthModel) 99
+                                                                   })
+            }, new MacroStabilityInwardsPreconsolidationStress[0]);
+
+            // Call
+            TestDelegate test = () => SoilProfileConverter.Convert(profile);
+
+            // Assert
+            const string message = "The value of argument 'shearStrengthModel' (99) is invalid for Enum type 'MacroStabilityInwardsShearStrengthModel'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, message);
+        }
+
+        [Test]
+        [TestCase(MacroStabilityInwardsShearStrengthModel.CPhi, ShearStrengthModel.CPhi)]
+        [TestCase(MacroStabilityInwardsShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated)]
+        [TestCase(MacroStabilityInwardsShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated)]
+        public void Convert_ValidShearStrengthModel_ReturnExpectedUpliftVanShearStrengthModel(MacroStabilityInwardsShearStrengthModel originalShearStrengthModel,
+                                                                                              ShearStrengthModel expectedShearStrengthModel)
+        {
+            // Setup
+            var profile = new MacroStabilityInwardsSoilProfileUnderSurfaceLine(new[]
+            {
+                new MacroStabilityInwardsSoilLayerUnderSurfaceLine(CreateRing(21), new Point2D[0][],
+                                                                   new MacroStabilityInwardsSoilLayerData
+                                                                   {
+                                                                       ShearStrengthModel = originalShearStrengthModel
+                                                                   })
+            }, new MacroStabilityInwardsPreconsolidationStress[0]);
+
+            // Call
+            SoilProfile soilProfile = SoilProfileConverter.Convert(profile);
+
+            // Assert
+            Assert.AreEqual(expectedShearStrengthModel, soilProfile.Layers.First().ShearStrengthModel);
+        }
+
+        private static Point2D[] CreateRing(int seed)
+        {
+            var random = new Random(seed);
+            int x1 = random.Next();
+            int y1 = random.Next();
+            int x2 = x1;
+            int y2 = y1 + random.Next();
+            int x3 = x2 + random.Next();
+            int y3 = y2;
+            double x4 = x1 + (x3 - x1) * random.NextDouble();
+            int y4 = y1;
+
+            return new[]
+            {
+                new Point2D(x1, y1),
+                new Point2D(x2, y2),
+                new Point2D(x3, y3),
+                new Point2D(x4, y4)
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj
===================================================================
diff -u -rb97a663a2997575c7c2cdabc4172866b4e6597f3 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj)	(revision b97a663a2997575c7c2cdabc4172866b4e6597f3)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -53,6 +53,9 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="Converters\DrainageConstructionConverterTest.cs" />
+    <Compile Include="Converters\PhreaticLineOffsetsConverterTest.cs" />
+    <Compile Include="Converters\SoilProfileConverterTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WaternetCalculationServiceTest.cs" />
   </ItemGroup>
@@ -62,6 +65,40 @@
     </None>
     <None Include="packages.config" />
   </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="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
+      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
+      <Name>Ringtoets.Common.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.CalculatedInput\Ringtoets.MacroStabilityInwards.CalculatedInput.csproj">
+      <Project>{D0887613-858E-4EED-9320-8C5A09170761}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.CalculatedInput</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
+      <Project>{83D6B73E-91D5-46B0-9218-955DA1F75F7C}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.KernelWrapper\Ringtoets.MacroStabilityInwards.KernelWrapper.csproj">
+      <Project>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
+      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj">
+      <Project>{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Properties/AssemblyInfo.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Properties/AssemblyInfo.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,27 @@
+// Copyright (C) Stichting Deltares 2017. 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.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil")]
+[assembly: AssemblyProduct("Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil")]
+[assembly: Guid("53f7c73e-6d85-4b90-a6a8-daa7f4bcb071")]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil</RootNamespace>
+    <AssemblyName>Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
+      <Link>Properties\GlobalAssembly.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UpliftVanCalculatorInputAssert.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\build\Copying.licenseheader">
+      <Link>Copying.licenseheader</Link>
+    </None>
+    <None Include="packages.config" />
+  </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="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
+      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
+      <Name>Ringtoets.Common.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.KernelWrapper\Ringtoets.MacroStabilityInwards.KernelWrapper.csproj">
+      <Project>{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
+      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/UpliftVanCalculatorInputAssert.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/UpliftVanCalculatorInputAssert.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/UpliftVanCalculatorInputAssert.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,104 @@
+// Copyright (C) Stichting Deltares 2017. 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.Linq;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
+namespace Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil
+{
+    /// <summary>
+    /// Class for asserting Uplift Van calculator input.
+    /// </summary>
+    public static class UpliftVanCalculatorInputAssert
+    {
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>.</param>
+        /// <param name="actual">The actual <see cref="SoilProfile"/>.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        public static void AssertSoilProfile(IMacroStabilityInwardsSoilProfileUnderSurfaceLine original, SoilProfile actual)
+        {
+            IMacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers = original.Layers.ToArray();
+            SoilLayer[] actualLayers = actual.Layers.ToArray();
+
+            IMacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses = original.PreconsolidationStresses.ToArray();
+            PreconsolidationStress[] actualPreconsolidationStresses = actual.PreconsolidationStresses.ToArray();
+
+            AssertLayers(expectedLayers, actualLayers);
+            AssertPreconsolidationStresses(expectedPreconsolidationStresses, actualPreconsolidationStresses);
+        }
+
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="IMacroStabilityInwardsPreconsolidationStress"/> array.</param>
+        /// <param name="actual">The actual <see cref="PreconsolidationStress"/> array.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        private static void AssertPreconsolidationStresses(IMacroStabilityInwardsPreconsolidationStress[] original,
+                                                           PreconsolidationStress[] actual)
+        {
+            Assert.AreEqual(original.Length, actual.Length);
+            for (var i = 0; i < original.Length; i++)
+            {
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(original[i]).GetDesignValue(), actual[i].Stress);
+                Assert.AreSame(original[i].Location, actual[i].Coordinate);
+            }
+        }
+
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="IMacroStabilityInwardsSoilLayerUnderSurfaceLine"/> array.</param>
+        /// <param name="actual">The actual <see cref="SoilLayer"/> array.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        private static void AssertLayers(IMacroStabilityInwardsSoilLayerUnderSurfaceLine[] original, SoilLayer[] actual)
+        {
+            Assert.AreEqual(original.Length, actual.Length);
+
+            for (var i = 0; i < original.Length; i++)
+            {
+                Assert.AreSame(original[i].OuterRing, actual[i].OuterRing);
+                Assert.AreSame(original[i].Holes, actual[i].Holes);
+
+                IMacroStabilityInwardsSoilLayerData expectedData = original[i].Data;
+                Assert.AreEqual(expectedData.MaterialName, actual[i].MaterialName);
+                Assert.AreEqual(expectedData.UsePop, actual[i].UsePop);
+                Assert.AreEqual(expectedData.IsAquifer, actual[i].IsAquifer);
+                Assert.AreEqual(DilatancyType.Zero, actual[i].DilatancyType);
+                Assert.AreEqual(WaterPressureInterpolationModel.Automatic, actual[i].WaterPressureInterpolationModel);
+
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(expectedData).GetDesignValue(), actual[i].AbovePhreaticLevel);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(expectedData).GetDesignValue(), actual[i].BelowPhreaticLevel);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(expectedData).GetDesignValue(), actual[i].Cohesion);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(expectedData).GetDesignValue(), actual[i].FrictionAngle);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(expectedData).GetDesignValue(), actual[i].StrengthIncreaseExponent);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(expectedData).GetDesignValue(), actual[i].ShearStrengthRatio);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(expectedData).GetDesignValue(), actual[i].Pop);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/packages.config
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/packages.config	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/packages.config	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) Stichting Deltares 2017. 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.
+-->
+
+<packages>
+  <package id="NUnit" version="3.8.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj
===================================================================
diff -u -r14c118039f313ea66787d8065daad0aa783b731a -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.Test.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -66,7 +66,6 @@
     <Compile Include="MacroStabilityInwardsLocationInputDailyTest.cs" />
     <Compile Include="MacroStabilityInwardsLocationInputExtremeTest.cs" />
     <Compile Include="MacroStabilityInwardsLocationInputTest.cs" />
-    <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs" />
     <Compile Include="MacroStabilityInwardsShearStrengthModelTest.cs" />
     <Compile Include="MacroStabilityInwardsSliceTest.cs" />
     <Compile Include="MacroStabilityInwardsSlidingCircleTest.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -0,0 +1,225 @@
+// Copyright (C) Stichting Deltares 2017. 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 Core.Common.Base.Geometry;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.Test
+{
+    [TestFixture]
+    public class MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest
+    {
+        private Random random;
+        private double mean;
+        private double coefficientOfVariation;
+
+        [SetUp]
+        public void Setup()
+        {
+            random = new Random(21);
+            mean = random.NextDouble();
+            coefficientOfVariation = random.NextDouble();
+        }
+
+        [Test]
+        public void GetAbovePhreaticLevel_ValidSoilLayerData_CreateDesignVariableForAbovePhreaticLevel()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                AbovePhreaticLevel =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation,
+                    Shift = (RoundedDouble) (mean - 0.1)
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> abovePhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.AbovePhreaticLevel, abovePhreaticLevel.Distribution);
+            AssertPercentile(0.5, abovePhreaticLevel);
+        }
+
+        [Test]
+        public void GetBelowPhreaticLevel_ValidSoilLayerData_CreateDesignVariableForBelowPhreaticLevel()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                BelowPhreaticLevel =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation,
+                    Shift = (RoundedDouble) (mean - 0.1)
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> belowPhreaticLevel = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.BelowPhreaticLevel, belowPhreaticLevel.Distribution);
+            AssertPercentile(0.5, belowPhreaticLevel);
+        }
+
+        [Test]
+        public void GetCohesion_ValidSoilLayerData_CreateDesignVariableForCohesion()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                Cohesion =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> cohesion = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.Cohesion, cohesion.Distribution);
+            AssertPercentile(0.05, cohesion);
+        }
+
+        [Test]
+        public void GetFrictionAngle_ValidSoilLayerData_CreateDesignVariableForFrictionAngle()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                FrictionAngle =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> frictionAngle = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.FrictionAngle, frictionAngle.Distribution);
+            AssertPercentile(0.05, frictionAngle);
+        }
+
+        [Test]
+        public void GetShearStrengthRatio_ValidSoilLayerData_CreateDesignVariableForShearStrengthRatio()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                ShearStrengthRatio =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> shearStrengthRatio = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.ShearStrengthRatio, shearStrengthRatio.Distribution);
+            AssertPercentile(0.05, shearStrengthRatio);
+        }
+
+        [Test]
+        public void GetStrengthIncreaseExponent_ValidSoilLayerData_CreateDesignVariableForStrengthIncreaseExponent()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                StrengthIncreaseExponent =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> strengthIncreaseExponent = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.StrengthIncreaseExponent, strengthIncreaseExponent.Distribution);
+            AssertPercentile(0.05, strengthIncreaseExponent);
+        }
+
+        [Test]
+        public void GetPop_ValidSoilLayerData_CreateDesignVariableForPop()
+        {
+            // Setup
+            var data = new MacroStabilityInwardsSoilLayerData
+            {
+                Pop =
+                {
+                    Mean = (RoundedDouble) mean,
+                    CoefficientOfVariation = (RoundedDouble) coefficientOfVariation
+                }
+            };
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> pop = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(data);
+
+            // Assert
+            DistributionAssert.AreEqual(data.Pop, pop.Distribution);
+            AssertPercentile(0.05, pop);
+        }
+
+        [Test]
+        public void GetPreconsolidationStress_ValidPreconsolidationStress_CreateDesignVariableForPreconsolidationStress()
+        {
+            // Setup
+            var location = new Point2D(random.NextDouble(), random.NextDouble());
+            var stressDistribution = new VariationCoefficientLogNormalDistribution
+            {
+                Mean = (RoundedDouble) 0.005,
+                CoefficientOfVariation = (RoundedDouble) coefficientOfVariation
+            };
+
+            var preconsolidationStress = new MacroStabilityInwardsPreconsolidationStress(location, stressDistribution);
+
+            // Call
+            VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> preconsoldationStress =
+                MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(preconsolidationStress);
+
+            // Assert
+            DistributionAssert.AreEqual(preconsolidationStress.Stress, preconsoldationStress.Distribution);
+            AssertPercentile(0.05, preconsoldationStress);
+        }
+
+        private static void AssertPercentile(double percentile, VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> designVariable)
+        {
+            Assert.IsInstanceOf<VariationCoefficientLogNormalDistributionDesignVariable>(designVariable);
+            var percentileBasedDesignVariable = (VariationCoefficientLogNormalDistributionDesignVariable) designVariable;
+            Assert.AreEqual(percentile, percentileBasedDesignVariable.Percentile);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj
===================================================================
diff -u -r14c118039f313ea66787d8065daad0aa783b731a -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -54,6 +54,7 @@
     </Compile>
     <Compile Include="MacroStabilityInwardsDikeSoilScenarioTest.cs" />
     <Compile Include="MacroStabilityInwardsPhreaticLineTest.cs" />
+    <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs" />
     <Compile Include="MacroStabilityInwardsWaternetLineTest.cs" />
     <Compile Include="MacroStabilityInwardsWaternetTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -82,6 +83,14 @@
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
+      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
+      <Name>Ringtoets.Common.Data.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
+      <Project>{83D6B73E-91D5-46B0-9218-955DA1F75F7C}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
       <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/DrainageConstructionConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/PhreaticLineOffsetsConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/SoilProfileConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r90a9502badff5788374461a1b2179a5dd0e866a2 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -28,6 +28,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
@@ -37,7 +38,6 @@
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.MacroStabilityInwards.Primitives;
-using Ringtoets.MacroStabilityInwards.Service.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Service.Test.csproj)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Service.Test.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
@@ -62,10 +62,7 @@
     </Compile>
     <Compile Include="Converters\MacroStabilityInwardsSlidingCurveConverterTest.cs" />
     <Compile Include="Converters\MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs" />
-    <Compile Include="Converters\DrainageConstructionConverterTest.cs" />
-    <Compile Include="Converters\PhreaticLineOffsetsConverterTest.cs" />
     <Compile Include="Converters\UpliftVanSlipPlaneConverterTest.cs" />
-    <Compile Include="Converters\SoilProfileConverterTest.cs" />
     <Compile Include="MacroStabilityInwardsCalculationActivityTest.cs" />
     <Compile Include="MacroStabilityInwardsCalculationServiceTest.cs" />
     <Compile Include="MacroStabilityInwardsDataSynchronizationServiceTest.cs" />
@@ -115,6 +112,10 @@
       <Project>{55be9a1b-68ab-488f-af20-e037a50063db}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil\Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj">
+      <Project>{53F7C73E-6D85-4B90-A6A8-DAA7F4BCB071}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Data.TestUtil\Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj">
       <Project>{2b78cf04-4785-4f27-a6e5-45bddbb7bf04}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data.TestUtil</Name>
@@ -123,10 +124,6 @@
       <Project>{3810D738-6412-47D1-8BC0-729D55BC951F}</Project>
       <Name>Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Service.TestUtil\Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj">
-      <Project>{F966AE28-DE6B-497A-8449-37EC607E9F69}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.Service.TestUtil</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?