Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs
===================================================================
diff -u -r3205f0f75b990a6816739526352cb793e334e67b -rc40864eb1a9d292ad2b9058fb28e63811be38498
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision 3205f0f75b990a6816739526352cb793e334e67b)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision c40864eb1a9d292ad2b9058fb28e63811be38498)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Deltares.WTIStability.Data.Geo;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
@@ -115,16 +114,16 @@
 
             IUpliftVanKernel upliftVanKernel = factory.CreateUpliftVanKernel();
 
-            upliftVanKernel.MoveGrid = input.MoveGrid;
-            upliftVanKernel.MaximumSliceWidth = input.MaximumSliceWidth;
+            upliftVanKernel.SetMoveGrid(input.MoveGrid);
+            upliftVanKernel.SetMaximumSliceWidth(input.MaximumSliceWidth);
             upliftVanKernel.SetSoilModel(SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray()));
             upliftVanKernel.SetSoilProfile(SoilProfileCreator.Create(input.SoilProfile.PreconsolidationStresses, layersWithSoil));
             upliftVanKernel.SetLocationExtreme(UpliftVanStabilityLocationCreator.CreateExtreme(input));
-            upliftVanKernel.LocationDaily = UpliftVanStabilityLocationCreator.CreateDaily(input);
-            upliftVanKernel.SurfaceLine = SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection);
-            upliftVanKernel.SlipPlaneUpliftVan = SlipPlaneUpliftVanCreator.Create(input.SlipPlane);
-            upliftVanKernel.SlipPlaneConstraints = SlipPlaneConstraintsCreator.Create(input.SlipPlaneConstraints);
-            upliftVanKernel.GridAutomaticDetermined = input.SlipPlane.GridAutomaticDetermined;
+            upliftVanKernel.SetLocationDaily(UpliftVanStabilityLocationCreator.CreateDaily(input));
+            upliftVanKernel.SetSurfaceLine(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection));
+            upliftVanKernel.SetSlipPlaneUpliftVan(SlipPlaneUpliftVanCreator.Create(input.SlipPlane));
+            upliftVanKernel.SetSlipPlaneConstraints(SlipPlaneConstraintsCreator.Create(input.SlipPlaneConstraints));
+            upliftVanKernel.SetGridAutomaticDetermined(input.SlipPlane.GridAutomaticDetermined);
 
             return upliftVanKernel;
         }
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs
===================================================================
diff -u -r3205f0f75b990a6816739526352cb793e334e67b -rc40864eb1a9d292ad2b9058fb28e63811be38498
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision 3205f0f75b990a6816739526352cb793e334e67b)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision c40864eb1a9d292ad2b9058fb28e63811be38498)
@@ -40,91 +40,91 @@
     public interface IUpliftVanKernel
     {
         /// <summary>
-        /// Sets the soil model.
+        /// Gets the factor of stability.
         /// </summary>
-        void SetSoilModel(SoilModel soilModel);
+        double FactorOfStability { get; }
 
         /// <summary>
-        /// Sets the soil profile.
+        /// Gets the z value.
         /// </summary>
-        void SetSoilProfile(SoilProfile2D soilProfile);
+        double ZValue { get; }
 
         /// <summary>
-        /// Sets the location under extreme conditions.
+        /// Gets the forbidden zones x entry min.
         /// </summary>
-        void SetLocationExtreme(StabilityLocation stabilityLocation);
+        double ForbiddenZonesXEntryMin { get; }
 
         /// <summary>
-        /// Sets the location under daily circumstances.
+        /// Gets the forbidden zones x entry max.
         /// </summary>
-        StabilityLocation LocationDaily { set; }
+        double ForbiddenZonesXEntryMax { get; }
 
         /// <summary>
-        /// Sets the surface line.
+        /// Gets the sliding curve result.
         /// </summary>
-        SurfaceLine2 SurfaceLine { set; }
+        SlidingDualCircle SlidingCurveResult { get; }
 
         /// <summary>
-        /// Sets the move grid property.
+        /// Gets the slip plane result.
         /// </summary>
-        bool MoveGrid { set; }
+        SlipPlaneUpliftVan SlipPlaneResult { get; }
 
         /// <summary>
-        /// Sets the maximum slice width.
-        /// [m]
+        /// Gets the messages returned by the kernel during
+        /// the calculation.
         /// </summary>
-        double MaximumSliceWidth { set; }
+        IEnumerable<LogMessage> CalculationMessages { get; }
 
         /// <summary>
-        /// Sets the slip plane Uplift Van.
+        /// Sets the soil model.
         /// </summary>
-        SlipPlaneUpliftVan SlipPlaneUpliftVan { set; }
+        void SetSoilModel(SoilModel soilModel);
 
         /// <summary>
-        /// Sets the slip plane constraints.
+        /// Sets the soil profile.
         /// </summary>
-        SlipPlaneConstraints SlipPlaneConstraints { set; }
+        void SetSoilProfile(SoilProfile2D soilProfile);
 
         /// <summary>
-        /// Sets whether the grid is automatically determined or not.
+        /// Sets the location under extreme conditions.
         /// </summary>
-        bool GridAutomaticDetermined { set; }
+        void SetLocationExtreme(StabilityLocation stabilityLocation);
 
         /// <summary>
-        /// Gets the factor of stability.
+        /// Sets the location under daily circumstances.
         /// </summary>
-        double FactorOfStability { get; }
+        void SetLocationDaily(StabilityLocation stabilityLocation);
 
         /// <summary>
-        /// Gets the z value.
+        /// Sets the surface line 2.
         /// </summary>
-        double ZValue { get; }
+        void SetSurfaceLine(SurfaceLine2 surfaceLine2);
 
         /// <summary>
-        /// Gets the forbidden zones x entry min.
+        /// Sets the move grid property.
         /// </summary>
-        double ForbiddenZonesXEntryMin { get; }
+        void SetMoveGrid(bool moveGrid);
 
         /// <summary>
-        /// Gets the forbidden zones x entry max.
+        /// Sets the maximum slice width.
+        /// [m]
         /// </summary>
-        double ForbiddenZonesXEntryMax { get; }
+        void SetMaximumSliceWidth(double maximumSliceWidth);
 
         /// <summary>
-        /// Gets the sliding curve result.
+        /// Sets the slip plane Uplift Van.
         /// </summary>
-        SlidingDualCircle SlidingCurveResult { get; }
+        void SetSlipPlaneUpliftVan(SlipPlaneUpliftVan slipPlaneUpliftVan);
 
         /// <summary>
-        /// Gets the slip plane result.
+        /// Sets the slip plane constraints.
         /// </summary>
-        SlipPlaneUpliftVan SlipPlaneResult { get; }
+        void SetSlipPlaneConstraints(SlipPlaneConstraints slipPlaneConstraints);
 
         /// <summary>
-        /// Gets the messages returned by the kernel during
-        /// the calculation.
+        /// Sets whether the grid is automatically determined or not.
         /// </summary>
-        IEnumerable<LogMessage> CalculationMessages { get; }
+        void SetGridAutomaticDetermined(bool gridAutomaticDetermined);
 
         /// <summary>
         /// Performs the Uplift Van calculation.
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -r3205f0f75b990a6816739526352cb793e334e67b -rc40864eb1a9d292ad2b9058fb28e63811be38498
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 3205f0f75b990a6816739526352cb793e334e67b)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision c40864eb1a9d292ad2b9058fb28e63811be38498)
@@ -147,6 +147,41 @@
             stabilityModel.Location = stabilityLocation;
         }
 
+        public void SetLocationDaily(StabilityLocation stabilityLocation)
+        {
+            LocationDaily = stabilityLocation;
+        }
+
+        public void SetSurfaceLine(SurfaceLine2 surfaceLine2)
+        {
+            SurfaceLine = surfaceLine2;
+        }
+
+        public void SetMoveGrid(bool moveGrid)
+        {
+            MoveGrid = moveGrid;
+        }
+
+        public void SetMaximumSliceWidth(double maximumSliceWidth)
+        {
+            MaximumSliceWidth = maximumSliceWidth;
+        }
+
+        public void SetSlipPlaneUpliftVan(SlipPlaneUpliftVan slipPlaneUpliftVan)
+        {
+            SlipPlaneUpliftVan = slipPlaneUpliftVan;
+        }
+
+        public void SetSlipPlaneConstraints(SlipPlaneConstraints slipPlaneConstraints)
+        {
+            SlipPlaneConstraints = slipPlaneConstraints;
+        }
+
+        public void SetGridAutomaticDetermined(bool gridAutomaticDetermined)
+        {
+            GridAutomaticDetermined = gridAutomaticDetermined;
+        }
+
         public void SetSoilModel(SoilModel soilModel)
         {
             stabilityModel.SoilModel = soilModel;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs
===================================================================
diff -u -r3205f0f75b990a6816739526352cb793e334e67b -rc40864eb1a9d292ad2b9058fb28e63811be38498
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs	(.../UpliftVanKernelStub.cs)	(revision 3205f0f75b990a6816739526352cb793e334e67b)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs	(.../UpliftVanKernelStub.cs)	(revision c40864eb1a9d292ad2b9058fb28e63811be38498)
@@ -65,39 +65,24 @@
 
         public SoilModel SoilModel { get; private set; }
 
-        public void SetSoilModel(SoilModel soilModel)
-        {
-            SoilModel = soilModel;
-        }
-
         public SoilProfile2D SoilProfile { get; private set; }
 
-        public void SetSoilProfile(SoilProfile2D soilProfile)
-        {
-            SoilProfile = soilProfile;
-        }
-
         public StabilityLocation LocationExtreme { get; private set; }
 
-        public void SetLocationExtreme(StabilityLocation stabilityLocation)
-        {
-            LocationExtreme = stabilityLocation;
-        }
+        public StabilityLocation LocationDaily { get; private set; }
 
-        public StabilityLocation LocationDaily { get; set; }
+        public bool MoveGrid { get; private set; }
 
-        public bool MoveGrid { get; set; }
+        public double MaximumSliceWidth { get; private set; }
 
-        public double MaximumSliceWidth { get; set; }
+        public SurfaceLine2 SurfaceLine { get; private set; }
 
-        public SurfaceLine2 SurfaceLine { get; set; }
+        public SlipPlaneUpliftVan SlipPlaneUpliftVan { get; private set; }
 
-        public SlipPlaneUpliftVan SlipPlaneUpliftVan { get; set; }
+        public SlipPlaneConstraints SlipPlaneConstraints { get; private set; }
 
-        public SlipPlaneConstraints SlipPlaneConstraints { get; set; }
+        public bool GridAutomaticDetermined { get; private set; }
 
-        public bool GridAutomaticDetermined { get; set; }
-
         public double FactorOfStability { get; set; }
 
         public double ZValue { get; set; }
@@ -112,6 +97,56 @@
 
         public IEnumerable<LogMessage> CalculationMessages { get; set; }
 
+        public void SetSoilModel(SoilModel soilModel)
+        {
+            SoilModel = soilModel;
+        }
+
+        public void SetSoilProfile(SoilProfile2D soilProfile)
+        {
+            SoilProfile = soilProfile;
+        }
+
+        public void SetLocationExtreme(StabilityLocation stabilityLocation)
+        {
+            LocationExtreme = stabilityLocation;
+        }
+
+        public void SetLocationDaily(StabilityLocation stabilityLocation)
+        {
+            LocationDaily = stabilityLocation;
+        }
+
+        public void SetSurfaceLine(SurfaceLine2 surfaceLine2)
+        {
+            SurfaceLine = surfaceLine2;
+        }
+
+        public void SetMoveGrid(bool moveGrid)
+        {
+            MoveGrid = moveGrid;
+        }
+
+        public void SetMaximumSliceWidth(double maximumSliceWidth)
+        {
+            MaximumSliceWidth = maximumSliceWidth;
+        }
+
+        public void SetSlipPlaneUpliftVan(SlipPlaneUpliftVan slipPlaneUpliftVan)
+        {
+            SlipPlaneUpliftVan = slipPlaneUpliftVan;
+        }
+
+        public void SetSlipPlaneConstraints(SlipPlaneConstraints slipPlaneConstraints)
+        {
+            SlipPlaneConstraints = slipPlaneConstraints;
+        }
+
+        public void SetGridAutomaticDetermined(bool gridAutomaticDetermined)
+        {
+            GridAutomaticDetermined = gridAutomaticDetermined;
+        }
+
         public void Calculate()
         {
             if (ThrowExceptionOnCalculate)