Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs
===================================================================
diff -u -rb97a663a2997575c7c2cdabc4172866b4e6597f3 -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs	(.../WaternetCalculationService.cs)	(revision b97a663a2997575c7c2cdabc4172866b4e6597f3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs	(.../WaternetCalculationService.cs)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -19,10 +19,73 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.Converters;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Output;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels;
+using Ringtoets.MacroStabilityInwards.Primitives;
+
 namespace Ringtoets.MacroStabilityInwards.CalculatedInput
 {
     /// <summary>
-    /// This class can be used to calculate Waternet for a macro stability inwards calculation based on other input parameters.
+    /// This class can be used to calculate Waternet for a macro stability inwards
+    /// calculation based on other input parameters.
     /// </summary>
-    public static class WaternetCalculationService {}
+    public static class WaternetCalculationService
+    {
+        /// <summary>
+        /// Calculated the Waternet with extreme circumstances based on the values 
+        /// of the <see cref="IMacroStabilityInwardsWaternetInput"/>.
+        /// </summary>
+        /// <param name="input">The input to get the values from.</param>
+        /// <returns>A calculated <see cref="MacroStabilityInwardsWaternet"/>,
+        /// or <c>null</c> when the Waternet could be calculated.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="input"/>
+        /// is <c>null</c>.</exception>
+        public static MacroStabilityInwardsWaternet CalculateExtreme(IMacroStabilityInwardsWaternetInput input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            var calculatorInput = new WaternetCalculatorInput(new WaternetCalculatorInput.ConstructionProperties
+            {
+                WaternetCreationMode = WaternetCreationMode.CreateWaternet,
+                PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017,
+                AssessmentLevel = input.AssessmentLevel,
+                LandwardDirection = LandwardDirection.PositiveX,
+                SurfaceLine = input.SurfaceLine,
+                SoilProfile = SoilProfileConverter.Convert(input.SoilProfileUnderSurfaceLine),
+                DrainageConstruction = DrainageConstructionConverter.Convert(input),
+                PhreaticLineOffsets = PhreaticLineOffsetsConverter.Convert(input.LocationInputExtreme),
+                DikeSoilScenario = input.DikeSoilScenario,
+                WaterLevelRiverAverage = input.WaterLevelRiverAverage,
+                WaterLevelPolder = input.LocationInputExtreme.WaterLevelPolder,
+                MinimumLevelPhreaticLineAtDikeTopRiver = input.MinimumLevelPhreaticLineAtDikeTopRiver,
+                MinimumLevelPhreaticLineAtDikeTopPolder = input.MinimumLevelPhreaticLineAtDikeTopPolder,
+                LeakageLengthOutwardsPhreaticLine3 = input.LeakageLengthOutwardsPhreaticLine3,
+                LeakageLengthInwardsPhreaticLine3 = input.LeakageLengthInwardsPhreaticLine3,
+                LeakageLengthOutwardsPhreaticLine4 = input.LeakageLengthOutwardsPhreaticLine4,
+                LeakageLengthInwardsPhreaticLine4 = input.LeakageLengthInwardsPhreaticLine4,
+                PiezometricHeadPhreaticLine2Outwards = input.PiezometricHeadPhreaticLine2Outwards,
+                PiezometricHeadPhreaticLine2Inwards = input.PiezometricHeadPhreaticLine2Inwards,
+                PenetrationLength = input.LocationInputExtreme.PenetrationLength,
+                AdjustPhreaticLine3And4ForUplift = input.AdjustPhreaticLine3And4ForUplift,
+            });
+
+            IWaternetCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance
+                                                                                   .CreateWaternetExtremeCalculator(
+                                                                                       calculatorInput,
+                                                                                       MacroStabilityInwardsKernelWrapperFactory.Instance);
+
+            WaternetCalculatorResult result = calculator.Calculate();
+
+            return null;
+        }
+    }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs
===================================================================
diff -u -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -119,7 +119,7 @@
             SoilProfile soilProfile = SoilProfileConverter.Convert(profile);
 
             // Assert
-            UpliftVanCalculatorInputAssert.AssertSoilProfile(profile, soilProfile);
+            CalculatorInputAssert.AssertSoilProfile(profile, soilProfile);
         }
 
         [Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj
===================================================================
diff -u -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.Test.csproj)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -98,6 +98,14 @@
       <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>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil\Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj">
+      <Project>{3810D738-6412-47D1-8BC0-729D55BC951F}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.KernelWrapper.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. 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs
===================================================================
diff -u -rb97a663a2997575c7c2cdabc4172866b4e6597f3 -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs	(.../WaternetCalculationServiceTest.cs)	(revision b97a663a2997575c7c2cdabc4172866b4e6597f3)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs	(.../WaternetCalculationServiceTest.cs)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -19,13 +19,79 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using System.Linq;
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Data.TestUtil;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Output;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.CalculatedInput.Test
 {
     [TestFixture]
     public class WaternetCalculationServiceTest
     {
-        
+        [Test]
+        public void CalculateExtreme_InputNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => WaternetCalculationService.CalculateExtreme(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("input", exception.ParamName);
+        }
+
+        [Test]
+        public void CalculateExtreme_WithInput_SetsInputOnCalculator()
+        {
+            // Setup
+            MacroStabilityInwardsCalculationScenario testCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
+            MacroStabilityInwardsInput input = testCalculation.InputParameters;
+
+            using (new MacroStabilityInwardsCalculatorFactoryConfig())
+            {
+                // Call
+                WaternetCalculationService.CalculateExtreme(input);
+
+                // Assert
+                AssertInput(input, (TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance);
+            }
+        }
+
+        private static void AssertInput(IMacroStabilityInwardsWaternetInput originalInput, TestMacroStabilityInwardsCalculatorFactory factory)
+        {
+            WaternetCalculatorInput actualInput = factory.LastCreatedWaternetCalculator.Input;
+            CalculatorInputAssert.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile);
+            CalculatorInputAssert.AssertDrainageConstruction(originalInput, actualInput.DrainageConstruction);
+            CalculatorInputAssert.AssertPhreaticLineOffsets(originalInput.LocationInputExtreme, actualInput.PhreaticLineOffsets);
+            Assert.AreEqual(WaternetCreationMode.CreateWaternet, actualInput.WaternetCreationMode);
+            Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod);
+            Assert.AreEqual(LandwardDirection.PositiveX, actualInput.LandwardDirection);
+            Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine);
+            Assert.AreEqual(originalInput.AssessmentLevel, actualInput.AssessmentLevel);
+            Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario);
+            Assert.AreEqual(originalInput.WaterLevelRiverAverage, actualInput.WaterLevelRiverAverage);
+            Assert.AreEqual(originalInput.LocationInputExtreme.WaterLevelPolder, actualInput.WaterLevelPolder);
+            Assert.AreEqual(originalInput.DrainageConstructionPresent, actualInput.DrainageConstruction.IsPresent);
+            Assert.AreEqual(originalInput.XCoordinateDrainageConstruction, actualInput.DrainageConstruction.XCoordinate);
+            Assert.AreEqual(originalInput.ZCoordinateDrainageConstruction, actualInput.DrainageConstruction.ZCoordinate);
+            Assert.AreEqual(originalInput.MinimumLevelPhreaticLineAtDikeTopRiver, actualInput.MinimumLevelPhreaticLineAtDikeTopRiver);
+            Assert.AreEqual(originalInput.MinimumLevelPhreaticLineAtDikeTopPolder, actualInput.MinimumLevelPhreaticLineAtDikeTopPolder);
+            Assert.AreEqual(originalInput.LeakageLengthOutwardsPhreaticLine3, actualInput.LeakageLengthOutwardsPhreaticLine3);
+            Assert.AreEqual(originalInput.LeakageLengthInwardsPhreaticLine3, actualInput.LeakageLengthInwardsPhreaticLine3);
+            Assert.AreEqual(originalInput.LeakageLengthOutwardsPhreaticLine4, actualInput.LeakageLengthOutwardsPhreaticLine4);
+            Assert.AreEqual(originalInput.LeakageLengthInwardsPhreaticLine4, actualInput.LeakageLengthInwardsPhreaticLine4);
+            Assert.AreEqual(originalInput.PiezometricHeadPhreaticLine2Outwards, actualInput.PiezometricHeadPhreaticLine2Outwards);
+            Assert.AreEqual(originalInput.PiezometricHeadPhreaticLine2Inwards, actualInput.PiezometricHeadPhreaticLine2Inwards);
+            Assert.AreEqual(originalInput.LocationInputExtreme.PenetrationLength, actualInput.PenetrationLength);
+            Assert.AreEqual(originalInput.AdjustPhreaticLine3And4ForUplift, actualInput.AdjustPhreaticLine3And4ForUplift);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -0,0 +1,134 @@
+// 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 CalculatorInputAssert
+    {
+        /// <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="original"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="IMacroStabilityInwardsWaternetInput"/>.</param>
+        /// <param name="actual">The actual <see cref="DrainageConstruction"/>.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="original"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        public static void AssertDrainageConstruction(IMacroStabilityInwardsWaternetInput original, DrainageConstruction actual)
+        {
+            Assert.AreEqual(original.DrainageConstructionPresent, actual.IsPresent);
+            Assert.AreEqual(original.XCoordinateDrainageConstruction, actual.XCoordinate);
+            Assert.AreEqual(original.ZCoordinateDrainageConstruction, actual.ZCoordinate);
+        }
+
+        /// <summary>
+        /// Asserts whether <paramref name="original"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="IMacroStabilityInwardsLocationInput"/>.</param>
+        /// <param name="actual">The actual <see cref="PhreaticLineOffsets"/>.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="original"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        public static void AssertPhreaticLineOffsets(IMacroStabilityInwardsLocationInput original, PhreaticLineOffsets actual)
+        {
+            Assert.AreEqual(original.UseDefaultOffsets, actual.UseDefaults);
+            Assert.AreEqual(original.PhreaticLineOffsetBelowDikeTopAtRiver, actual.BelowDikeTopAtRiver);
+            Assert.AreEqual(original.PhreaticLineOffsetBelowDikeTopAtPolder, actual.BelowDikeTopAtPolder);
+            Assert.AreEqual(original.PhreaticLineOffsetBelowDikeToeAtPolder, actual.BelowDikeToeAtPolder);
+            Assert.AreEqual(original.PhreaticLineOffsetBelowShoulderBaseInside, actual.BelowShoulderBaseInside);
+        }
+
+        /// <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/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj
===================================================================
diff -u -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil.csproj)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -51,7 +51,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UpliftVanCalculatorInputAssert.cs" />
+    <Compile Include="CalculatorInputAssert.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag b976e43b1c5480a6bcb004c58c307d69ebe9f4a2 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/UpliftVanCalculatorInputAssert.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/WaternetCalculatorStubTest.cs
===================================================================
diff -u -ra1b68821bc11b10c5ec147df7109ffd69e0acbd2 -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/WaternetCalculatorStubTest.cs	(.../WaternetCalculatorStubTest.cs)	(revision a1b68821bc11b10c5ec147df7109ffd69e0acbd2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/WaternetCalculatorStubTest.cs	(.../WaternetCalculatorStubTest.cs)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -19,8 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using System.Linq;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.Waternet;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test.Calculators.Waternet
@@ -37,6 +40,40 @@
             // Assert
             Assert.IsInstanceOf<IWaternetCalculator>(calculator);
             Assert.IsNull(calculator.Input);
+            Assert.IsNull(calculator.Output);
         }
+
+        [Test]
+        public void Calculate_ThrowExceptionOnCalculateFalse_ReturnResult()
+        {
+            // Setup
+            var calculator = new WaternetCalculatorStub();
+
+            // Call
+            WaternetCalculatorResult result = calculator.Calculate();
+
+            // Assert
+            Assert.AreEqual(1, result.PhreaticLines.Count());
+            Assert.AreEqual(1, result.WaternetLines.Count());
+        }
+
+        [Test]
+        public void Calculate_ThrowExceptionOnCalculateTrue_ThrowWaternetCalculatorException()
+        {
+            // Setup
+            var calculator = new WaternetCalculatorStub
+            {
+                ThrowExceptionOnCalculate = true
+            };
+
+            // Call
+            TestDelegate test = () => calculator.Calculate();
+
+            // Assert
+            var exception = Assert.Throws<WaternetCalculatorException>(test);
+            Assert.IsNull(exception.InnerException);
+            Assert.AreEqual($"Message 1{Environment.NewLine}Message 2", exception.Message);
+            Assert.IsNull(calculator.Output);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/WaternetCalculatorStub.cs
===================================================================
diff -u -r909bc295bbe951245e30dd57407efc924be76e12 -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/WaternetCalculatorStub.cs	(.../WaternetCalculatorStub.cs)	(revision 909bc295bbe951245e30dd57407efc924be76e12)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/WaternetCalculatorStub.cs	(.../WaternetCalculatorStub.cs)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Core.Common.Base.Geometry;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Output;
@@ -31,13 +33,40 @@
     public class WaternetCalculatorStub : IWaternetCalculator
     {
         /// <summary>
-        /// Gest or sets the Waternet calculator input.
+        /// Gets or sets the Waternet calculator input.
         /// </summary>
         public WaternetCalculatorInput Input { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Waternet calculator output.
+        /// </summary>
+        public WaternetCalculatorResult Output { get; set; }
+
+        /// <summary>
+        /// Indicator whether an exception must be thrown when performing the calculation.
+        /// </summary>
+        public bool ThrowExceptionOnCalculate { get; set; }
+
         public WaternetCalculatorResult Calculate()
         {
-            return null;
+            if (ThrowExceptionOnCalculate)
+            {
+                throw new WaternetCalculatorException($"Message 1{Environment.NewLine}Message 2");
+            }
+            return Output ?? (Output = CreateWaternetCalculatorResult());
         }
+
+        private static WaternetCalculatorResult CreateWaternetCalculatorResult()
+        {
+            var phreaticLineResult = new WaternetPhreaticLineResult("line 1", new Point2D[0]);
+            return new WaternetCalculatorResult(
+                new[]
+                {
+                    phreaticLineResult
+                }, new[]
+                {
+                    new WaternetLineResult("line 2", new Point2D[0], phreaticLineResult)
+                });
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -rcfa7dc2bce5e37f5677d9c8772b68599f9e26a0c -rb976e43b1c5480a6bcb004c58c307d69ebe9f4a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision cfa7dc2bce5e37f5677d9c8772b68599f9e26a0c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision b976e43b1c5480a6bcb004c58c307d69ebe9f4a2)
@@ -589,10 +589,10 @@
         private static void AssertInput(MacroStabilityInwardsInput originalInput, TestMacroStabilityInwardsCalculatorFactory factory)
         {
             UpliftVanCalculatorInput actualInput = factory.LastCreatedUpliftVanCalculator.Input;
-            UpliftVanCalculatorInputAssert.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile);
-            AssertDrainageConstruction(originalInput, actualInput.DrainageConstruction);
-            AssertPhreaticLineOffsets(originalInput.LocationInputExtreme, actualInput.PhreaticLineOffsetsExtreme);
-            AssertPhreaticLineOffsets(originalInput.LocationInputDaily, actualInput.PhreaticLineOffsetsDaily);
+            CalculatorInputAssert.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile);
+            CalculatorInputAssert.AssertDrainageConstruction(originalInput, actualInput.DrainageConstruction);
+            CalculatorInputAssert.AssertPhreaticLineOffsets(originalInput.LocationInputExtreme, actualInput.PhreaticLineOffsetsExtreme);
+            CalculatorInputAssert.AssertPhreaticLineOffsets(originalInput.LocationInputDaily, actualInput.PhreaticLineOffsetsDaily);
             AssertSlipPlaneInput(originalInput, actualInput.SlipPlane);
             Assert.AreEqual(WaternetCreationMode.CreateWaternet, actualInput.WaternetCreationMode);
             Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod);
@@ -624,22 +624,6 @@
             Assert.AreEqual(originalInput.SlipPlaneMinimumLength, actualInput.SlipPlaneMinimumLength);
         }
 
-        private static void AssertDrainageConstruction(MacroStabilityInwardsInput originalInput, DrainageConstruction actualInput)
-        {
-            Assert.AreEqual(originalInput.DrainageConstructionPresent, actualInput.IsPresent);
-            Assert.AreEqual(originalInput.XCoordinateDrainageConstruction, actualInput.XCoordinate);
-            Assert.AreEqual(originalInput.ZCoordinateDrainageConstruction, actualInput.ZCoordinate);
-        }
-
-        private static void AssertPhreaticLineOffsets(IMacroStabilityInwardsLocationInput expected, PhreaticLineOffsets actual)
-        {
-            Assert.AreEqual(expected.UseDefaultOffsets, actual.UseDefaults);
-            Assert.AreEqual(expected.PhreaticLineOffsetBelowDikeTopAtRiver, actual.BelowDikeTopAtRiver);
-            Assert.AreEqual(expected.PhreaticLineOffsetBelowDikeTopAtPolder, actual.BelowDikeTopAtPolder);
-            Assert.AreEqual(expected.PhreaticLineOffsetBelowDikeToeAtPolder, actual.BelowDikeToeAtPolder);
-            Assert.AreEqual(expected.PhreaticLineOffsetBelowShoulderBaseInside, actual.BelowShoulderBaseInside);
-        }
-
         private static void AssertSlipPlaneInput(MacroStabilityInwardsInput originalInput, UpliftVanSlipPlane actualInput)
         {
             Assert.IsFalse(actualInput.GridAutomaticDetermined);