Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -r88ca97f32fd2d896edce687f2ade6d27a0a5df6d -rf81e440cf9c89825947cb632f34b6c21dec6a0df
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 88ca97f32fd2d896edce687f2ade6d27a0a5df6d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision f81e440cf9c89825947cb632f34b6c21dec6a0df)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void Calculate_InputNotComplete_ThrowsUpliftVanKernelWrapperException()
+        public void Calculate_ExceptionInWrappedKernel_ThrowsUpliftVanKernelWrapperException()
         {
             // Setup
             var kernel = new UpliftVanKernelWrapper();
@@ -65,91 +65,6 @@
         }
 
         [Test]
-        public void Calculate_InvalidInput_ThrowsUpliftVanKernelWrapperException()
-        {
-            // Setup
-            var point1 = new Point2D(0, 0);
-            var point2 = new Point2D(1, 1);
-            var point3 = new Point2D(2, 2);
-            var point4 = new Point2D(3, 3);
-            var curve1 = new GeometryCurve(point1, point2);
-            var curve2 = new GeometryCurve(point2, point3);
-            var curve3 = new GeometryCurve(point3, point4);
-            var curve4 = new GeometryCurve(point4, point1);
-            var loop = new GeometryLoop
-            {
-                CurveList =
-                {
-                    curve1,
-                    curve2,
-                    curve3,
-                    curve4
-                }
-            };
-            var kernel = new UpliftVanKernelWrapper
-            {
-                SurfaceLine = new SurfaceLine2(),
-                Location = new StabilityLocation(),
-                SoilProfile = new SoilProfile2D
-                {
-                    Geometry = new GeometryData
-                    {
-                        Points =
-                        {
-                            point1,
-                            point2,
-                            point3,
-                            point4
-                        },
-                        Curves =
-                        {
-                            curve1,
-                            curve2,
-                            curve3,
-                            curve4
-                        },
-                        Loops =
-                        {
-                            loop
-                        }
-                    },
-                    Surfaces =
-                    {
-                        new SoilLayer2D
-                        {
-                            GeometrySurface = new GeometrySurface
-                            {
-                                OuterLoop = loop
-                            }
-                        }
-                    }
-                },
-                SoilModel = new SoilModel
-                {
-                    Soils =
-                    {
-                        new Soil()
-                    }
-                },
-                SlipPlaneUpliftVan = new SlipPlaneUpliftVan(),
-                MoveGrid = true,
-                AutomaticForbiddenZones = true,
-                CreateZones = true,
-                SlipPlaneMinimumDepth = 0,
-                MaximumSliceWidth = 0,
-                SlipPlaneMinimumLength = 0
-            };
-
-            // Call
-            TestDelegate test = () => kernel.Calculate();
-
-            // Assert
-            var exception = Assert.Throws<UpliftVanKernelWrapperException>(test);
-            Assert.IsInstanceOf<ArgumentNullException>(exception.InnerException);
-            Assert.AreEqual(exception.InnerException.Message, exception.Message);
-        }
-
-        [Test]
         public void Calculate_ErrorInCalculation_ThrowsUpliftVanKernelWrapperException()
         {
             // Setup
@@ -239,11 +154,11 @@
             var exception = Assert.Throws<UpliftVanKernelWrapperException>(test);
             CollectionAssert.AreEqual($"Index was out of range. Must be non-negative and less than the size of the collection.{Environment.NewLine}" +
                                       $"Parameter name: index{Environment.NewLine}" +
-                                      $"Fatale fout in Uplift-Van berekening", exception.Message);
+                                      "Fatale fout in Uplift-Van berekening", exception.Message);
         }
 
         [Test]
-        public void Calculate_CompleteInput_InputCorrectlySetToWrappedKernel()
+        public void Constructor_CompleteInput_InputCorrectlySetToWrappedKernel()
         {
             // Setup
             var random = new Random(21);