Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -rc40864eb1a9d292ad2b9058fb28e63811be38498 -r84a67af25b5c01ccf1150067f848455268da0a45
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision c40864eb1a9d292ad2b9058fb28e63811be38498)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 84a67af25b5c01ccf1150067f848455268da0a45)
@@ -72,62 +72,6 @@
             ForbiddenZonesXEntryMax = double.NaN;
         }
 
-        public StabilityLocation LocationDaily
-        {
-            set
-            {
-                stabilityModel.LocationDaily = value;
-            }
-        }
-
-        public SurfaceLine2 SurfaceLine
-        {
-            set
-            {
-                stabilityModel.SurfaceLine2 = value;
-            }
-        }
-
-        public SlipPlaneConstraints SlipPlaneConstraints
-        {
-            set
-            {
-                stabilityModel.SlipPlaneConstraints = value;
-            }
-        }
-
-        public bool MoveGrid
-        {
-            set
-            {
-                stabilityModel.MoveGrid = value;
-            }
-        }
-
-        public double MaximumSliceWidth
-        {
-            set
-            {
-                stabilityModel.MaximumSliceWidth = value;
-            }
-        }
-
-        public SlipPlaneUpliftVan SlipPlaneUpliftVan
-        {
-            set
-            {
-                stabilityModel.SlipPlaneUpliftVan = value;
-            }
-        }
-
-        public bool GridAutomaticDetermined
-        {
-            set
-            {
-                stabilityModel.SlipCircle.Auto = value;
-            }
-        }
-
         public double FactorOfStability { get; private set; }
 
         public double ZValue { get; private set; }
@@ -149,37 +93,37 @@
 
         public void SetLocationDaily(StabilityLocation stabilityLocation)
         {
-            LocationDaily = stabilityLocation;
+            stabilityModel.LocationDaily = stabilityLocation;
         }
 
         public void SetSurfaceLine(SurfaceLine2 surfaceLine2)
         {
-            SurfaceLine = surfaceLine2;
+            stabilityModel.SurfaceLine2 = surfaceLine2;
         }
 
         public void SetMoveGrid(bool moveGrid)
         {
-            MoveGrid = moveGrid;
+            stabilityModel.MoveGrid = moveGrid;
         }
 
         public void SetMaximumSliceWidth(double maximumSliceWidth)
         {
-            MaximumSliceWidth = maximumSliceWidth;
+            stabilityModel.MaximumSliceWidth = maximumSliceWidth;
         }
 
         public void SetSlipPlaneUpliftVan(SlipPlaneUpliftVan slipPlaneUpliftVan)
         {
-            SlipPlaneUpliftVan = slipPlaneUpliftVan;
+            stabilityModel.SlipPlaneUpliftVan = slipPlaneUpliftVan;
         }
 
         public void SetSlipPlaneConstraints(SlipPlaneConstraints slipPlaneConstraints)
         {
-            SlipPlaneConstraints = slipPlaneConstraints;
+            stabilityModel.SlipPlaneConstraints = slipPlaneConstraints;
         }
 
         public void SetGridAutomaticDetermined(bool gridAutomaticDetermined)
         {
-            GridAutomaticDetermined = gridAutomaticDetermined;
+            stabilityModel.SlipCircle.Auto = gridAutomaticDetermined;
         }
 
         public void SetSoilModel(SoilModel soilModel)
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -r3205f0f75b990a6816739526352cb793e334e67b -r84a67af25b5c01ccf1150067f848455268da0a45
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 3205f0f75b990a6816739526352cb793e334e67b)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 84a67af25b5c01ccf1150067f848455268da0a45)
@@ -69,19 +69,17 @@
             var slipPlaneConstraints = new SlipPlaneConstraints();
 
             // Call
-            var kernel = new UpliftVanKernelWrapper
-            {
-                LocationDaily = stabilityLocationDaily,
-                SurfaceLine = surfaceLine,
-                MaximumSliceWidth = maximumSliceWidth,
-                SlipPlaneUpliftVan = slipPlaneUpliftVan,
-                MoveGrid = moveGrid,
-                GridAutomaticDetermined = gridAutomaticDetermined,
-                SlipPlaneConstraints = slipPlaneConstraints
-            };
+            var kernel = new UpliftVanKernelWrapper();
             kernel.SetSoilModel(soilModel);
             kernel.SetSoilProfile(soilProfile2D);
             kernel.SetLocationExtreme(stabilityLocationExtreme);
+            kernel.SetLocationDaily(stabilityLocationDaily);
+            kernel.SetSurfaceLine(surfaceLine);
+            kernel.SetMaximumSliceWidth(maximumSliceWidth);
+            kernel.SetSlipPlaneUpliftVan(slipPlaneUpliftVan);
+            kernel.SetMoveGrid(moveGrid);
+            kernel.SetGridAutomaticDetermined(gridAutomaticDetermined);
+            kernel.SetSlipPlaneConstraints(slipPlaneConstraints);
 
             // Assert
             var stabilityModel = TypeUtils.GetField<StabilityModel>(kernel, "stabilityModel");
@@ -222,15 +220,7 @@
             {
                 OuterLoop = loop
             };
-            var kernelWrapper = new UpliftVanKernelWrapper
-            {
-                SurfaceLine = new SurfaceLine2(),
-                LocationDaily = new StabilityLocation(),
-                SlipPlaneUpliftVan = new SlipPlaneUpliftVan(),
-                MoveGrid = true,
-                MaximumSliceWidth = 0,
-                SlipPlaneConstraints = new SlipPlaneConstraints()
-            };
+            var kernelWrapper = new UpliftVanKernelWrapper();
             kernelWrapper.SetSoilModel(new SoilModel
             {
                 Soils =
@@ -274,6 +264,12 @@
                 }
             });
             kernelWrapper.SetLocationExtreme(new StabilityLocation());
+            kernelWrapper.SetLocationDaily(new StabilityLocation());
+            kernelWrapper.SetSurfaceLine(new SurfaceLine2());
+            kernelWrapper.SetSlipPlaneUpliftVan(new SlipPlaneUpliftVan());
+            kernelWrapper.SetMoveGrid(true);
+            kernelWrapper.SetMaximumSliceWidth(0);
+            kernelWrapper.SetSlipPlaneConstraints(new SlipPlaneConstraints());
             
             return kernelWrapper;
         }