Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreator.cs
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r4a496868926ff7d3ab5d3080dd833699ec3784fc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreator.cs	(.../StabilityLocationCreator.cs)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreator.cs	(.../StabilityLocationCreator.cs)	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
@@ -24,7 +24,9 @@
 using Deltares.WaternetCreator;
 using Deltares.WTIStability;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.Waternet;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
 using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
@@ -60,9 +62,9 @@
 
             return new StabilityLocation
             {
-                DikeSoilScenario = ConvertDikeSoilScenario(input.DikeSoilScenario),
-                WaternetCreationMode = ConvertWaternetCreationMode(input.WaternetCreationMode),
-                PlLineCreationMethod = ConvertPlLineCreationMethod(input.PlLineCreationMethod),
+                DikeSoilScenario = StabilityLocationCreatorHelper.ConvertDikeSoilScenario(input.DikeSoilScenario),
+                WaternetCreationMode = StabilityLocationCreatorHelper.ConvertWaternetCreationMode(input.WaternetCreationMode),
+                PlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(input.PlLineCreationMethod),
                 WaterLevelRiver = input.AssessmentLevel,
                 WaterLevelRiverAverage = input.WaterLevelRiverAverage,
                 WaterLevelPolder = input.WaterLevelPolderExtreme,
@@ -109,9 +111,9 @@
 
             return new StabilityLocation
             {
-                DikeSoilScenario = ConvertDikeSoilScenario(input.DikeSoilScenario),
-                WaternetCreationMode = ConvertWaternetCreationMode(input.WaternetCreationMode),
-                PlLineCreationMethod = ConvertPlLineCreationMethod(input.PlLineCreationMethod),
+                DikeSoilScenario = StabilityLocationCreatorHelper.ConvertDikeSoilScenario(input.DikeSoilScenario),
+                WaternetCreationMode = StabilityLocationCreatorHelper.ConvertWaternetCreationMode(input.WaternetCreationMode),
+                PlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(input.PlLineCreationMethod),
                 WaterLevelRiver = input.WaterLevelRiverAverage,
                 WaterLevelRiverAverage = input.WaterLevelRiverAverage,
                 WaterLevelPolder = input.WaterLevelPolderDaily,
@@ -135,106 +137,5 @@
                 PenetrationLength = 0.0
             };
         }
-
-        /// <summary>
-        /// Converts a <see cref="MacroStabilityInwardsDikeSoilScenario"/> into a <see cref="DikeSoilScenario"/>.
-        /// </summary>
-        /// <param name="dikeSoilScenario">The <see cref="MacroStabilityInwardsDikeSoilScenario"/> to convert.</param>
-        /// <returns>A <see cref="DikeSoilScenario"/> based on <paramref name="dikeSoilScenario"/>.</returns>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="dikeSoilScenario"/>
-        /// is an invalid value.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="dikeSoilScenario"/>
-        /// is a valid value but unsupported.</exception>
-        private static DikeSoilScenario ConvertDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario dikeSoilScenario)
-        {
-            if (!Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), dikeSoilScenario))
-            {
-                throw new InvalidEnumArgumentException(nameof(dikeSoilScenario),
-                                                       (int) dikeSoilScenario,
-                                                       typeof(MacroStabilityInwardsDikeSoilScenario));
-            }
-
-            switch (dikeSoilScenario)
-            {
-                case MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay:
-                    return DikeSoilScenario.ClayDikeOnClay;
-                case MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay:
-                    return DikeSoilScenario.SandDikeOnClay;
-                case MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand:
-                    return DikeSoilScenario.ClayDikeOnSand;
-                case MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand:
-                    return DikeSoilScenario.SandDikeOnSand;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Converts a <see cref="WaternetCreationMode"/> into a <see cref="WTIStabilityWaternetCreationMode"/>.
-        /// </summary>
-        /// <param name="waternetCreationMode">The <see cref="WaternetCreationMode"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityWaternetCreationMode"/> based on <paramref name="waternetCreationMode"/>.</returns>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="waternetCreationMode"/>
-        /// is an invalid value.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="waternetCreationMode"/>
-        /// is a valid value but unsupported.</exception>
-        private static WTIStabilityWaternetCreationMode ConvertWaternetCreationMode(WaternetCreationMode waternetCreationMode)
-        {
-            if (!Enum.IsDefined(typeof(WaternetCreationMode), waternetCreationMode))
-            {
-                throw new InvalidEnumArgumentException(nameof(waternetCreationMode),
-                                                       (int) waternetCreationMode,
-                                                       typeof(WaternetCreationMode));
-            }
-
-            switch (waternetCreationMode)
-            {
-                case WaternetCreationMode.CreateWaternet:
-                    return WTIStabilityWaternetCreationMode.CreateWaternet;
-                case WaternetCreationMode.FillInWaternetValues:
-                    return WTIStabilityWaternetCreationMode.FillInWaternetValues;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Converts a <see cref="PlLineCreationMethod"/> into a <see cref="WTIStabilityPlLineCreationMethod"/>.
-        /// </summary>
-        /// <param name="plLineCreationMethod">The <see cref="PlLineCreationMethod"/> to convert.</param>
-        /// <returns>A <see cref="WTIStabilityPlLineCreationMethod"/> based on <paramref name="plLineCreationMethod"/>.</returns>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="plLineCreationMethod"/>
-        /// is an invalid value.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="plLineCreationMethod"/>
-        /// is a valid value but unsupported.</exception>
-        private static WTIStabilityPlLineCreationMethod ConvertPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod)
-        {
-            if (!Enum.IsDefined(typeof(PlLineCreationMethod), plLineCreationMethod))
-            {
-                throw new InvalidEnumArgumentException(nameof(plLineCreationMethod),
-                                                       (int) plLineCreationMethod,
-                                                       typeof(PlLineCreationMethod));
-            }
-
-            switch (plLineCreationMethod)
-            {
-                case PlLineCreationMethod.ExpertKnowledgeRrd:
-                    return WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd;
-                case PlLineCreationMethod.ExpertKnowledgeLinearInDike:
-                    return WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike;
-                case PlLineCreationMethod.RingtoetsWti2017:
-                    return WTIStabilityPlLineCreationMethod.RingtoetsWti2017;
-                case PlLineCreationMethod.DupuitStatic:
-                    return WTIStabilityPlLineCreationMethod.DupuitStatic;
-                case PlLineCreationMethod.DupuitDynamic:
-                    return WTIStabilityPlLineCreationMethod.DupuitDynamic;
-                case PlLineCreationMethod.Sensors:
-                    return WTIStabilityPlLineCreationMethod.Sensors;
-                case PlLineCreationMethod.None:
-                    return WTIStabilityPlLineCreationMethod.None;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/StabilityLocationCreatorHelper.cs	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
@@ -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.ComponentModel;
+using Deltares.WaternetCreator;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
+using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
+using WTIStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
+using WTIStabilityWaternetCreationMode = Deltares.WaternetCreator.WaternetCreationMode;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
+{
+    /// <summary>
+    /// Helper class to convert properties needed in the <see cref="StabilityLocationCreator"/>.
+    /// </summary>
+    public static class StabilityLocationCreatorHelper
+    {
+        /// <summary>
+        /// Converts a <see cref="MacroStabilityInwardsDikeSoilScenario"/> into a <see cref="DikeSoilScenario"/>.
+        /// </summary>
+        /// <param name="dikeSoilScenario">The <see cref="MacroStabilityInwardsDikeSoilScenario"/> to convert.</param>
+        /// <returns>A <see cref="DikeSoilScenario"/> based on <paramref name="dikeSoilScenario"/>.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="dikeSoilScenario"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="dikeSoilScenario"/>
+        /// is a valid value but unsupported.</exception>
+        public static DikeSoilScenario ConvertDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario dikeSoilScenario)
+        {
+            if (!Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), dikeSoilScenario))
+            {
+                throw new InvalidEnumArgumentException(nameof(dikeSoilScenario),
+                                                       (int)dikeSoilScenario,
+                                                       typeof(MacroStabilityInwardsDikeSoilScenario));
+            }
+
+            switch (dikeSoilScenario)
+            {
+                case MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay:
+                    return DikeSoilScenario.ClayDikeOnClay;
+                case MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay:
+                    return DikeSoilScenario.SandDikeOnClay;
+                case MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand:
+                    return DikeSoilScenario.ClayDikeOnSand;
+                case MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand:
+                    return DikeSoilScenario.SandDikeOnSand;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+
+        /// <summary>
+        /// Converts a <see cref="WaternetCreationMode"/> into a <see cref="WTIStabilityWaternetCreationMode"/>.
+        /// </summary>
+        /// <param name="waternetCreationMode">The <see cref="WaternetCreationMode"/> to convert.</param>
+        /// <returns>A <see cref="WTIStabilityWaternetCreationMode"/> based on <paramref name="waternetCreationMode"/>.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="waternetCreationMode"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="waternetCreationMode"/>
+        /// is a valid value but unsupported.</exception>
+        public static WTIStabilityWaternetCreationMode ConvertWaternetCreationMode(WaternetCreationMode waternetCreationMode)
+        {
+            if (!Enum.IsDefined(typeof(WaternetCreationMode), waternetCreationMode))
+            {
+                throw new InvalidEnumArgumentException(nameof(waternetCreationMode),
+                                                       (int)waternetCreationMode,
+                                                       typeof(WaternetCreationMode));
+            }
+
+            switch (waternetCreationMode)
+            {
+                case WaternetCreationMode.CreateWaternet:
+                    return WTIStabilityWaternetCreationMode.CreateWaternet;
+                case WaternetCreationMode.FillInWaternetValues:
+                    return WTIStabilityWaternetCreationMode.FillInWaternetValues;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+
+        /// <summary>
+        /// Converts a <see cref="PlLineCreationMethod"/> into a <see cref="WTIStabilityPlLineCreationMethod"/>.
+        /// </summary>
+        /// <param name="plLineCreationMethod">The <see cref="PlLineCreationMethod"/> to convert.</param>
+        /// <returns>A <see cref="WTIStabilityPlLineCreationMethod"/> based on <paramref name="plLineCreationMethod"/>.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="plLineCreationMethod"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="plLineCreationMethod"/>
+        /// is a valid value but unsupported.</exception>
+        public static WTIStabilityPlLineCreationMethod ConvertPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod)
+        {
+            if (!Enum.IsDefined(typeof(PlLineCreationMethod), plLineCreationMethod))
+            {
+                throw new InvalidEnumArgumentException(nameof(plLineCreationMethod),
+                                                       (int)plLineCreationMethod,
+                                                       typeof(PlLineCreationMethod));
+            }
+
+            switch (plLineCreationMethod)
+            {
+                case PlLineCreationMethod.ExpertKnowledgeRrd:
+                    return WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd;
+                case PlLineCreationMethod.ExpertKnowledgeLinearInDike:
+                    return WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike;
+                case PlLineCreationMethod.RingtoetsWti2017:
+                    return WTIStabilityPlLineCreationMethod.RingtoetsWti2017;
+                case PlLineCreationMethod.DupuitStatic:
+                    return WTIStabilityPlLineCreationMethod.DupuitStatic;
+                case PlLineCreationMethod.DupuitDynamic:
+                    return WTIStabilityPlLineCreationMethod.DupuitDynamic;
+                case PlLineCreationMethod.Sensors:
+                    return WTIStabilityPlLineCreationMethod.Sensors;
+                case PlLineCreationMethod.None:
+                    return WTIStabilityPlLineCreationMethod.None;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r4a496868926ff7d3ab5d3080dd833699ec3784fc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj)	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
@@ -64,6 +64,7 @@
     <Compile Include="Creators\Input\SlipPlaneUpliftVanCreator.cs" />
     <Compile Include="Creators\Input\SoilProfileCreator.cs" />
     <Compile Include="Creators\Input\StabilityLocationCreator.cs" />
+    <Compile Include="Creators\Input\StabilityLocationCreatorHelper.cs" />
     <Compile Include="Creators\Input\SurfaceLineCreator.cs" />
     <Compile Include="Calculators\UpliftVan\IUpliftVanCalculator.cs" />
     <Compile Include="Calculators\IMacroStabilityInwardsCalculatorFactory.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorHelperTest.cs	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
@@ -0,0 +1,117 @@
+// 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.ComponentModel;
+using Core.Common.TestUtil;
+using Deltares.WaternetCreator;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using PlLineCreationMethod = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.PlLineCreationMethod;
+using WaternetCreationMode = Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaternetCreationMode;
+using WTIStabilityPlLineCreationMethod = Deltares.WaternetCreator.PlLineCreationMethod;
+using WTIStabilityWaternetCreationMethod = Deltares.WaternetCreator.WaternetCreationMode;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
+{
+    [TestFixture]
+    public class StabilityLocationCreatorHelperTest
+    {
+        [Test]
+        public void ConvertDikeSoilScenario_InvalidDikeSoilScenario_ThrowInvalidEnumArgumentException()
+        {
+            // Call
+            TestDelegate test = () => StabilityLocationCreatorHelper.ConvertDikeSoilScenario((MacroStabilityInwardsDikeSoilScenario) 99);
+
+            // Assert
+            string message = $"The value of argument 'dikeSoilScenario' ({99}) is invalid for Enum type '{typeof(MacroStabilityInwardsDikeSoilScenario).Name}'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, message);
+        }
+
+        [Test]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, DikeSoilScenario.ClayDikeOnClay)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)]
+        public void ConvertDikeSoilScenario_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
+                                                                                                              DikeSoilScenario expectedDikeSoilScenario)
+        {
+            // Call
+            DikeSoilScenario convertedDikeSoilScenario = StabilityLocationCreatorHelper.ConvertDikeSoilScenario(macroStabilityInwardsDikeSoilScenario);
+
+            // Assert
+            Assert.AreEqual(expectedDikeSoilScenario, convertedDikeSoilScenario);
+        }
+
+        [Test]
+        public void ConvertWaternetCreationMode_InvalidWaternetCreationMode_ThrowInvalidEnumArgumentException()
+        {
+            // Call
+            TestDelegate test = () => StabilityLocationCreatorHelper.ConvertWaternetCreationMode((WaternetCreationMode) 99);
+
+            // Assert
+            string message = $"The value of argument 'waternetCreationMode' ({99}) is invalid for Enum type '{typeof(WaternetCreationMode).Name}'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, message);
+        }
+
+        [Test]
+        [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
+        [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
+        public void ConvertWaternetCreationMode_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
+                                                                                                                          WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
+        {
+            // Call
+            WTIStabilityWaternetCreationMethod convertedWaternetCreationMode = StabilityLocationCreatorHelper.ConvertWaternetCreationMode(waternetCreationMode);
+
+            // Assert
+            Assert.AreEqual(expectedWaternetCreationMode, convertedWaternetCreationMode);
+        }
+
+        [Test]
+        public void ConvertPlLineCreationMethod_InvalidPlLineCreationMethod_ThrowInvalidEnumArgumentException()
+        {
+            // Call
+            TestDelegate test = () => StabilityLocationCreatorHelper.ConvertPlLineCreationMethod((PlLineCreationMethod) 99);
+
+            // Assert
+            string message = $"The value of argument 'plLineCreationMethod' ({99}) is invalid for Enum type '{typeof(PlLineCreationMethod).Name}'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, message);
+        }
+
+        [Test]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WTIStabilityPlLineCreationMethod.ExpertKnowledgeRrd)]
+        [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WTIStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)]
+        [TestCase(PlLineCreationMethod.RingtoetsWti2017, WTIStabilityPlLineCreationMethod.RingtoetsWti2017)]
+        [TestCase(PlLineCreationMethod.DupuitStatic, WTIStabilityPlLineCreationMethod.DupuitStatic)]
+        [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
+        [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
+        [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
+        public void ConvertPlLineCreationMethod_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
+                                                                                                                          WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
+        {
+            // Call
+            WTIStabilityPlLineCreationMethod actualPlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(plLineCreationMethod);
+
+            // Assert
+            Assert.AreEqual(expectedPlLineCreationMethod, actualPlLineCreationMethod);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r4a496868926ff7d3ab5d3080dd833699ec3784fc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs	(.../StabilityLocationCreatorTest.cs)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs	(.../StabilityLocationCreatorTest.cs)	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
@@ -81,7 +81,7 @@
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)]
         public void CreateExtreme_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
-                                                                                                    DikeSoilScenario dikeSoilScenario)
+                                                                                                    DikeSoilScenario expectedDikeSoilScenario)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -100,7 +100,7 @@
             StabilityLocation location = StabilityLocationCreator.CreateExtreme(input);
 
             // Assert
-            Assert.AreEqual(dikeSoilScenario, location.DikeSoilScenario);
+            Assert.AreEqual(expectedDikeSoilScenario, location.DikeSoilScenario);
         }
 
         [Test]
@@ -130,8 +130,8 @@
         [Test]
         [TestCase(WaternetCreationMode.CreateWaternet, WTIStabilityWaternetCreationMethod.CreateWaternet)]
         [TestCase(WaternetCreationMode.FillInWaternetValues, WTIStabilityWaternetCreationMethod.FillInWaternetValues)]
-        public void CreateExtreme_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode upliftVanWaternetCreationMode,
-                                                                                                            WTIStabilityWaternetCreationMethod waternetCreationMode)
+        public void CreateExtreme_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode,
+                                                                                                            WTIStabilityWaternetCreationMethod expectedWaternetCreationMode)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -143,14 +143,14 @@
                     SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"),
                     SoilProfile = new TestSoilProfile(),
                     SlipPlane = new UpliftVanSlipPlane(),
-                    WaternetCreationMode = upliftVanWaternetCreationMode
+                    WaternetCreationMode = waternetCreationMode
                 });
 
             // Call
             StabilityLocation location = StabilityLocationCreator.CreateExtreme(input);
 
             // Assert
-            Assert.AreEqual(waternetCreationMode, location.WaternetCreationMode);
+            Assert.AreEqual(expectedWaternetCreationMode, location.WaternetCreationMode);
         }
 
         [Test]
@@ -185,7 +185,7 @@
         [TestCase(PlLineCreationMethod.DupuitDynamic, WTIStabilityPlLineCreationMethod.DupuitDynamic)]
         [TestCase(PlLineCreationMethod.Sensors, WTIStabilityPlLineCreationMethod.Sensors)]
         [TestCase(PlLineCreationMethod.None, WTIStabilityPlLineCreationMethod.None)]
-        public void CreateExtreme_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod upliftVanPlLineCreationMethod,
+        public void CreateExtreme_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod,
                                                                                                             WTIStabilityPlLineCreationMethod expectedPlLineCreationMethod)
         {
             // Setup
@@ -198,7 +198,7 @@
                     SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"),
                     SoilProfile = new TestSoilProfile(),
                     SlipPlane = new UpliftVanSlipPlane(),
-                    PlLineCreationMethod = upliftVanPlLineCreationMethod
+                    PlLineCreationMethod = plLineCreationMethod
                 });
 
             // Call
@@ -337,7 +337,7 @@
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)]
         [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)]
         public void CreateDaily_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario,
-                                                                                                  DikeSoilScenario dikeSoilScenario)
+                                                                                                  DikeSoilScenario expectedDikeSoilScenario)
         {
             // Setup
             var input = new UpliftVanCalculatorInput(
@@ -356,7 +356,7 @@
             StabilityLocation location = StabilityLocationCreator.CreateDaily(input);
 
             // Assert
-            Assert.AreEqual(dikeSoilScenario, location.DikeSoilScenario);
+            Assert.AreEqual(expectedDikeSoilScenario, location.DikeSoilScenario);
         }
 
         [Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r4a496868926ff7d3ab5d3080dd833699ec3784fc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj)	(revision 4a496868926ff7d3ab5d3080dd833699ec3784fc)
@@ -81,6 +81,7 @@
     <Compile Include="Calculators\Waternet\WaternetCalculatorTest.cs" />
     <Compile Include="Creators\Input\SlipPlaneUpliftVanCreatorTest.cs" />
     <Compile Include="Creators\Input\SoilProfileCreatorTest.cs" />
+    <Compile Include="Creators\Input\StabilityLocationCreatorHelperTest.cs" />
     <Compile Include="Creators\Input\StabilityLocationCreatorTest.cs" />
     <Compile Include="Creators\Input\SurfaceLineCreatorTest.cs" />
     <Compile Include="Calculators\UpliftVan\Input\UpliftVanCalculatorInputTest.cs" />