Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs
===================================================================
diff -u -rf41767008e9489269fcd67a0a60608d8ddb8ac13 -r6df1ecea3d12b0f99e240a6d71be19f5ea29bf69
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs	(.../StabilityLocationCreatorTest.cs)	(revision f41767008e9489269fcd67a0a60608d8ddb8ac13)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/StabilityLocationCreatorTest.cs	(.../StabilityLocationCreatorTest.cs)	(revision 6df1ecea3d12b0f99e240a6d71be19f5ea29bf69)
@@ -207,14 +207,8 @@
             double assessmentLevel = random.Next();
             double waterLevelRiverAverage = random.Next();
             double waterLevelPolder = random.Next();
-            double xCoordinateDrainageConstruction = random.Next();
-            double zCoordinateDrainageConstruction = random.Next();
             double minimumLevelPhreaticLineAtDikeTopRiver = random.Next();
             double minimumLevelPhreaticLineAtDikeTopPolder = random.Next();
-            double phreaticLineOffsetBelowDikeTopAtRiver = random.Next();
-            double phreaticLineOffsetBelowDikeTopAtPolder = random.Next();
-            double phreaticLineOffsetBelowShoulderBaseInside = random.Next();
-            double phreaticLineOffsetBelowDikeToeAtPolder = random.Next();
             bool adjustPhreaticLine3And4ForUplift = random.NextBoolean();
             double leakageLengthOutwardsPhreaticLine3 = random.Next();
             double leakageLengthInwardsPhreaticLine3 = random.Next();
@@ -225,14 +219,12 @@
             double penetrationLength = random.Next();
 
             UpliftVanDrainageConstruction drainageConstruction = drainageConstructionPresent
-                                                                     ? new UpliftVanDrainageConstruction(
-                                                                         xCoordinateDrainageConstruction, zCoordinateDrainageConstruction)
+                                                                     ? new UpliftVanDrainageConstruction(random.Next(), random.Next())
                                                                      : new UpliftVanDrainageConstruction();
             UpliftVanPhreaticLineOffsets phreaticLineOffsets = useDefaultOffsets
                                                                    ? new UpliftVanPhreaticLineOffsets()
-                                                                   : new UpliftVanPhreaticLineOffsets(
-                                                                       phreaticLineOffsetBelowDikeTopAtRiver, phreaticLineOffsetBelowDikeTopAtPolder,
-                                                                       phreaticLineOffsetBelowDikeToeAtPolder, phreaticLineOffsetBelowShoulderBaseInside);
+                                                                   : new UpliftVanPhreaticLineOffsets(random.Next(), random.Next(),
+                                                                                                      random.Next(), random.Next());
 
             var input = new UpliftVanCalculatorInput(
                 new UpliftVanCalculatorInput.ConstructionProperties
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs
===================================================================
diff -u -r6139d8deb7b8f83cd06a4534f04ed18ecbada3b6 -r6df1ecea3d12b0f99e240a6d71be19f5ea29bf69
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs	(.../UpliftVanKernelInputAssert.cs)	(revision 6139d8deb7b8f83cd06a4534f04ed18ecbada3b6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs	(.../UpliftVanKernelInputAssert.cs)	(revision 6df1ecea3d12b0f99e240a6d71be19f5ea29bf69)
@@ -162,8 +162,8 @@
             Assert.AreEqual(expected.Length, actual.Length);
 
             for (var i = 0; i < expected.Length; i++)
-            {PreConsolidationStress
-                 expectedPreconsolidationStress = expected[i];
+            {
+                PreConsolidationStress expectedPreconsolidationStress = expected[i];
                 PreConsolidationStress actualPreconsolidationStress = actual[i];
 
                 Assert.AreEqual(expectedPreconsolidationStress.StressValue, actualPreconsolidationStress.StressValue);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r0f736d81afe800a482dff027fe93128a5e967114 -r6df1ecea3d12b0f99e240a6d71be19f5ea29bf69
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 6df1ecea3d12b0f99e240a6d71be19f5ea29bf69)
@@ -498,10 +498,11 @@
                 UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance)
                     .LastCreatedUpliftVanCalculator.Input;
                 Assert.IsTrue(actualInput.SlipPlane.GridAutomaticDetermined);
-                Assert.IsNaN(actualInput.SlipPlane.TangentZTop);
-                Assert.IsNaN(actualInput.SlipPlane.TangentZBottom);
                 Assert.IsNull(actualInput.SlipPlane.LeftGrid);
                 Assert.IsNull(actualInput.SlipPlane.RightGrid);
+                Assert.IsTrue(actualInput.SlipPlane.TangentLinesAutomaticAtBoundaries);
+                Assert.IsNaN(actualInput.SlipPlane.TangentZTop);
+                Assert.IsNaN(actualInput.SlipPlane.TangentZBottom);
             }
         }
 
@@ -676,6 +677,10 @@
 
             for (var i = 0; i < expectedSlices.Length; i++)
             {
+                Assert.AreSame(expectedSlices[i].TopLeftPoint, actualSlices[i].TopLeftPoint);
+                Assert.AreSame(expectedSlices[i].TopRightPoint, actualSlices[i].TopRightPoint);
+                Assert.AreSame(expectedSlices[i].BottomLeftPoint, actualSlices[i].BottomLeftPoint);
+                Assert.AreSame(expectedSlices[i].BottomRightPoint, actualSlices[i].BottomRightPoint);
                 Assert.AreEqual(expectedSlices[i].Cohesion, actualSlices[i].Cohesion);
                 Assert.AreEqual(expectedSlices[i].FrictionAngle, actualSlices[i].FrictionAngle);
                 Assert.AreEqual(expectedSlices[i].CriticalPressure, actualSlices[i].CriticalPressure);