Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r966508ce8afbf9998f515439659572d929dbbf29 -r2d7bf1296a75a456a433ae776fce3de1666fc096
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 966508ce8afbf9998f515439659572d929dbbf29)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 2d7bf1296a75a456a433ae776fce3de1666fc096)
@@ -24,16 +24,19 @@
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
+using Deltares.WTIStability.Data.Geo;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.UpliftVan.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Output;
 using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Primitives.MacroStabilityInwardsSoilUnderSurfaceLine;
@@ -122,6 +125,11 @@
             // Assert
             Assert.AreEqual(input.MoveGrid, upliftVanKernel.MoveGrid);
             Assert.AreEqual(input.MaximumSliceWidth, upliftVanKernel.MaximumSliceWidth);
+
+            Soil[] soils = SoilCreator.Create(input.SoilProfile);
+
+            UpliftVanKernelInputHelper.AssertSoilModels(SoilModelCreator.Create(soils), upliftVanKernel.SoilModel);
+
             Assert.AreEqual(input.GridAutomaticDetermined, upliftVanKernel.GridAutomaticDetermined);
             Assert.AreEqual(input.CreateZones, upliftVanKernel.CreateZones);
             Assert.AreEqual(input.AutomaticForbiddenZones, upliftVanKernel.AutomaticForbiddenZones);
@@ -148,9 +156,9 @@
             Assert.AreEqual(upliftVanKernel.ZValue, result.ZValue);
             Assert.AreEqual(upliftVanKernel.ForbiddenZonesXEntryMax, result.ForbiddenZonesXEntryMax);
             Assert.AreEqual(upliftVanKernel.ForbiddenZonesXEntryMin, result.ForbiddenZonesXEntryMin);
-            UpliftVanCalculatorResultHelper.AssertSlidingCurve(UpliftVanSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
+            UpliftVanCalculatorOutputHelper.AssertSlidingCurve(UpliftVanSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
                                                                result.SlidingCurveResult);
-            UpliftVanCalculatorResultHelper.AssertSlipPlaneGrid(UpliftVanCalculationGridResultCreator.Create(upliftVanKernel.SlipPlaneResult),
+            UpliftVanCalculatorOutputHelper.AssertSlipPlaneGrid(UpliftVanCalculationGridResultCreator.Create(upliftVanKernel.SlipPlaneResult),
                                                                 result.CalculationGridResult);
         }
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputHelper.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputHelper.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputHelper.cs	(revision 2d7bf1296a75a456a433ae776fce3de1666fc096)
@@ -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.Linq;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.UpliftVan.Output
+{
+    /// <summary>
+    /// Helper that can be used in tests.
+    /// </summary>
+    public static class UpliftVanCalculatorOutputHelper
+    {
+        /// <summary>
+        /// Assert whether the <paramref name="actual"/> is equal to the <paramref name="expected"/>.
+        /// </summary>
+        /// <param name="expected">The expected values.</param>
+        /// <param name="actual">The actual values.</param>
+        /// <exception cref="AssertionException">Thrown when the <paramref name="actual"/>
+        /// is not equal to the <paramref name="expected"/>.</exception>
+        public static void AssertSlidingCurve(UpliftVanSlidingCurveResult expected, UpliftVanSlidingCurveResult actual)
+        {
+            Assert.AreEqual(expected.IteratedHorizontalForce, actual.IteratedHorizontalForce);
+            Assert.AreEqual(expected.NonIteratedHorizontalForce, actual.NonIteratedHorizontalForce);
+            AssertCircle(expected.LeftCircle, actual.LeftCircle);
+            AssertCircle(expected.RightCircle, actual.RightCircle);
+
+            AssertSlices(expected.Slices.ToArray(), actual.Slices.ToArray());
+        }
+
+        public static void AssertSlipPlaneGrid(UpliftVanCalculationGridResult expected, UpliftVanCalculationGridResult actual)
+        {
+            CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines);
+            AssertGrid(expected.LeftGrid, actual.LeftGrid);
+            AssertGrid(expected.RightGrid, actual.RightGrid);
+        }
+
+        private static void AssertGrid(UpliftVanGridResult expected, UpliftVanGridResult actual)
+        {
+            Assert.AreEqual(expected.XLeft, actual.XLeft);
+            Assert.AreEqual(expected.XRight, actual.XRight);
+            Assert.AreEqual(expected.ZTop, actual.ZTop);
+            Assert.AreEqual(expected.ZBottom, actual.ZBottom);
+            Assert.AreEqual(expected.NumberOfHorizontalPoints, actual.NumberOfHorizontalPoints);
+            Assert.AreEqual(expected.NumberOfVerticalPoints, actual.NumberOfVerticalPoints);
+        }
+
+        private static void AssertCircle(UpliftVanSlidingCircleResult expected, UpliftVanSlidingCircleResult actual)
+        {
+            Assert.AreEqual(expected.Center, actual.Center);
+            Assert.AreEqual(expected.Radius, actual.Radius);
+            Assert.AreEqual(expected.IsActive, actual.IsActive);
+            Assert.AreEqual(expected.NonIteratedForce, actual.NonIteratedForce);
+            Assert.AreEqual(expected.IteratedForce, actual.IteratedForce);
+            Assert.AreEqual(expected.DrivingMoment, actual.DrivingMoment);
+            Assert.AreEqual(expected.ResistingMoment, actual.ResistingMoment);
+        }
+
+        private static void AssertSlices(UpliftVanSliceResult[] expectedSlices, UpliftVanSliceResult[] actualSlices)
+        {
+            Assert.AreEqual(expectedSlices.Length, actualSlices.Length);
+
+            for (var i = 0; i < expectedSlices.Length; i++)
+            {
+                Assert.AreEqual(expectedSlices[i].Cohesion, actualSlices[i].Cohesion);
+                Assert.AreEqual(expectedSlices[i].FrictionAngle, actualSlices[i].FrictionAngle);
+                Assert.AreEqual(expectedSlices[i].CriticalPressure, actualSlices[i].CriticalPressure);
+                Assert.AreEqual(expectedSlices[i].OverConsolidationRatio, actualSlices[i].OverConsolidationRatio);
+                Assert.AreEqual(expectedSlices[i].Pop, actualSlices[i].Pop);
+                Assert.AreEqual(expectedSlices[i].DegreeOfConsolidationPorePressureSoil, actualSlices[i].DegreeOfConsolidationPorePressureSoil);
+                Assert.AreEqual(expectedSlices[i].DegreeOfConsolidationPorePressureLoad, actualSlices[i].DegreeOfConsolidationPorePressureLoad);
+                Assert.AreEqual(expectedSlices[i].Dilatancy, actualSlices[i].Dilatancy);
+                Assert.AreEqual(expectedSlices[i].ExternalLoad, actualSlices[i].ExternalLoad);
+                Assert.AreEqual(expectedSlices[i].HydrostaticPorePressure, actualSlices[i].HydrostaticPorePressure);
+                Assert.AreEqual(expectedSlices[i].LeftForce, actualSlices[i].LeftForce);
+                Assert.AreEqual(expectedSlices[i].LeftForceAngle, actualSlices[i].LeftForceAngle);
+                Assert.AreEqual(expectedSlices[i].LeftForceY, actualSlices[i].LeftForceY);
+                Assert.AreEqual(expectedSlices[i].RightForce, actualSlices[i].RightForce);
+                Assert.AreEqual(expectedSlices[i].RightForceAngle, actualSlices[i].RightForceAngle);
+                Assert.AreEqual(expectedSlices[i].RightForceY, actualSlices[i].RightForceY);
+                Assert.AreEqual(expectedSlices[i].LoadStress, actualSlices[i].LoadStress);
+                Assert.AreEqual(expectedSlices[i].NormalStress, actualSlices[i].NormalStress);
+                Assert.AreEqual(expectedSlices[i].PorePressure, actualSlices[i].PorePressure);
+                Assert.AreEqual(expectedSlices[i].HorizontalPorePressure, actualSlices[i].HorizontalPorePressure);
+                Assert.AreEqual(expectedSlices[i].VerticalPorePressure, actualSlices[i].VerticalPorePressure);
+                Assert.AreEqual(expectedSlices[i].PiezometricPorePressure, actualSlices[i].PiezometricPorePressure);
+                Assert.AreEqual(expectedSlices[i].EffectiveStress, actualSlices[i].EffectiveStress);
+                Assert.AreEqual(expectedSlices[i].EffectiveStressDaily, actualSlices[i].EffectiveStressDaily);
+                Assert.AreEqual(expectedSlices[i].ExcessPorePressure, actualSlices[i].ExcessPorePressure);
+                Assert.AreEqual(expectedSlices[i].ShearStress, actualSlices[i].ShearStress);
+                Assert.AreEqual(expectedSlices[i].SoilStress, actualSlices[i].SoilStress);
+                Assert.AreEqual(expectedSlices[i].TotalPorePressure, actualSlices[i].TotalPorePressure);
+                Assert.AreEqual(expectedSlices[i].TotalStress, actualSlices[i].TotalStress);
+                Assert.AreEqual(expectedSlices[i].Weight, actualSlices[i].Weight);
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 2d7bf1296a75a456a433ae776fce3de1666fc096 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorResultHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputHelper.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputHelper.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputHelper.cs	(revision 2d7bf1296a75a456a433ae776fce3de1666fc096)
@@ -0,0 +1,62 @@
+// 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 Deltares.WTIStability.Data.Geo;
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Input
+{
+    /// <summary>
+    /// Helper that can be used in tests.
+    /// </summary>
+    public static class UpliftVanKernelInputHelper
+    {
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
+        /// </summary>
+        /// <param name="expected">The expected <see cref="SoilModel"/>.</param>
+        /// <param name="actual">The actual <see cref="SoilModel"/>.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// is not equal to <paramref name="expected"/>.</exception>
+        public static void AssertSoilModels(SoilModel expected, SoilModel actual)
+        {
+            Assert.AreEqual(expected.Soils.Count, actual.Soils.Count);
+
+            for (var i = 0; i < expected.Soils.Count; i++)
+            {
+                Soil expectedSoil = expected.Soils[i];
+                Soil actualSoil = actual.Soils[i];
+
+                Assert.AreEqual(expectedSoil.Name, actualSoil.Name);
+                Assert.AreEqual(expectedSoil.UsePop, actualSoil.UsePop);
+                Assert.AreEqual(expectedSoil.ShearStrengthModel, actualSoil.ShearStrengthModel);
+                Assert.AreEqual(expectedSoil.AbovePhreaticLevel, actualSoil.AbovePhreaticLevel);
+                Assert.AreEqual(expectedSoil.BelowPhreaticLevel, actualSoil.BelowPhreaticLevel);
+                Assert.AreEqual(expectedSoil.Cohesion, actualSoil.Cohesion);
+                Assert.AreEqual(expectedSoil.FrictionAngle, actualSoil.FrictionAngle);
+                Assert.AreEqual(expectedSoil.RatioCuPc, actualSoil.RatioCuPc);
+                Assert.AreEqual(expectedSoil.StrengthIncreaseExponent, actualSoil.StrengthIncreaseExponent);
+                Assert.AreEqual(expectedSoil.PoP, actualSoil.PoP);
+                Assert.AreEqual(expectedSoil.DilatancyType, actualSoil.DilatancyType);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -r8cf507b4db04c91cd5bc5ed243616f093a3016da -r2d7bf1296a75a456a433ae776fce3de1666fc096
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj)	(revision 8cf507b4db04c91cd5bc5ed243616f093a3016da)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.csproj)	(revision 2d7bf1296a75a456a433ae776fce3de1666fc096)
@@ -60,8 +60,9 @@
     <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorResultTestFactory.cs" />
     <Compile Include="Calculators\UpliftVan\Output\UpliftVanGridResultTestFactory.cs" />
     <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCircleResultTestFactory.cs" />
-    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorResultHelper.cs" />
+    <Compile Include="Calculators\UpliftVan\Output\UpliftVanCalculatorOutputHelper.cs" />
     <Compile Include="Calculators\UpliftVan\Output\UpliftVanSlidingCurveResultTestFactory.cs" />
+    <Compile Include="Kernels\UpliftVan\Input\UpliftVanKernelInputHelper.cs" />
     <Compile Include="Kernels\UpliftVan\Output\SlidingDualCircleTestFactory.cs" />
     <Compile Include="Kernels\UpliftVan\Output\SlipPlaneUpliftVanTestFactory.cs" />
     <Compile Include="Kernels\MacroStabilityInwardsKernelFactoryConfig.cs" />