Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/MacroStabilityInwardsKernelMessagesCreatorTest.cs
===================================================================
diff -u -rc07f72d9a77743ab37c2ec417890c003399c6d75 -ra5b0ec078310186800abc323de1dd773e20047c6
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/MacroStabilityInwardsKernelMessagesCreatorTest.cs	(.../MacroStabilityInwardsKernelMessagesCreatorTest.cs)	(revision c07f72d9a77743ab37c2ec417890c003399c6d75)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/MacroStabilityInwardsKernelMessagesCreatorTest.cs	(.../MacroStabilityInwardsKernelMessagesCreatorTest.cs)	(revision a5b0ec078310186800abc323de1dd773e20047c6)
@@ -58,18 +58,14 @@
             IEnumerable<MacroStabilityInwardsKernelMessage> kernelMessages = MacroStabilityInwardsKernelMessagesCreator.Create(logMessages);
 
             // Assert
-            Assert.AreEqual(3, kernelMessages.Count());
+            Assert.AreEqual(2, kernelMessages.Count());
             MacroStabilityInwardsKernelMessage firstMessage = kernelMessages.ElementAt(0);
             Assert.AreEqual("Calculation Warning", firstMessage.Message);
             Assert.AreEqual(MacroStabilityInwardsKernelMessageType.Warning, firstMessage.Type);
 
             MacroStabilityInwardsKernelMessage secondMessage = kernelMessages.ElementAt(1);
             Assert.AreEqual("Calculation Error", secondMessage.Message);
             Assert.AreEqual(MacroStabilityInwardsKernelMessageType.Error, secondMessage.Type);
-
-            MacroStabilityInwardsKernelMessage thirdMessage = kernelMessages.ElementAt(2);
-            Assert.AreEqual("Calculation Fatal Error", thirdMessage.Message);
-            Assert.AreEqual(MacroStabilityInwardsKernelMessageType.Error, thirdMessage.Type);
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanCalculationGridResultCreatorTest.cs
===================================================================
diff -u -r6a9788fc5f29669bce19de7cb24e004ff3faf65f -ra5b0ec078310186800abc323de1dd773e20047c6
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanCalculationGridResultCreatorTest.cs	(.../UpliftVanCalculationGridResultCreatorTest.cs)	(revision 6a9788fc5f29669bce19de7cb24e004ff3faf65f)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanCalculationGridResultCreatorTest.cs	(.../UpliftVanCalculationGridResultCreatorTest.cs)	(revision a5b0ec078310186800abc323de1dd773e20047c6)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Deltares.MacroStability.CSharpWrapper;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
@@ -43,7 +44,7 @@
         }
 
         [Test]
-        public void Create_WithSlipPlaneUpliftVan_ReturnUpliftVanCalculationGridResult()
+        public void Create_WithUpliftVanCalculationGrid_ReturnUpliftVanCalculationGridResult()
         {
             // Setup
             var random = new Random(21);
@@ -64,7 +65,7 @@
             double tangentLine1 = random.Next();
             double tangentLine2 = random.Next();
 
-            var slipPlaneUpliftVan = new UpliftVanCalculationGrid
+            var upliftVanCalculationGrid = new UpliftVanCalculationGrid
             {
                 LeftGrid = new CalculationGrid
                 {
@@ -84,20 +85,20 @@
                     GridXNumber = rightGridHorizontalPoints,
                     GridZNumber = rightGridVerticalPoints
                 },
-                TangentLines =
+                TangentLines = new List<double>
                 {
                     tangentLine1,
                     tangentLine2
                 }
             };
 
             // Call
-            UpliftVanCalculationGridResult result = UpliftVanCalculationGridResultCreator.Create(slipPlaneUpliftVan);
+            UpliftVanCalculationGridResult result = UpliftVanCalculationGridResultCreator.Create(upliftVanCalculationGrid);
 
             // Assert
-            AssertGrid(slipPlaneUpliftVan.LeftGrid, result.LeftGrid);
-            AssertGrid(slipPlaneUpliftVan.RightGrid, result.RightGrid);
-            CollectionAssert.AreEqual(slipPlaneUpliftVan.TangentLines, result.TangentLines);
+            AssertGrid(upliftVanCalculationGrid.LeftGrid, result.LeftGrid);
+            AssertGrid(upliftVanCalculationGrid.RightGrid, result.RightGrid);
+            CollectionAssert.AreEqual(upliftVanCalculationGrid.TangentLines, result.TangentLines);
         }
 
         private static void AssertGrid(CalculationGrid originalGrid, UpliftVanGrid actualGrid)
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs
===================================================================
diff -u -ra73d42cdf59762bf06c937a40ea822891b4da6b7 -ra5b0ec078310186800abc323de1dd773e20047c6
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs	(.../UpliftVanSlidingCurveResultCreatorTest.cs)	(revision a73d42cdf59762bf06c937a40ea822891b4da6b7)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs	(.../UpliftVanSlidingCurveResultCreatorTest.cs)	(revision a5b0ec078310186800abc323de1dd773e20047c6)
@@ -85,7 +85,8 @@
                 DrivingPassiveMoment = passiveCircleDrivingMoment,
                 ResistingPassiveMoment = passiveCircleResistingMoment,
                 IteratedHorizontalForce = iteratedHorizontalForce,
-                NonIteratedHorizontalForce = nonIteratedHorizontalForce
+                NonIteratedHorizontalForce = nonIteratedHorizontalForce,
+                Slices = new Slice[0]
             };
 
             // Call
@@ -152,6 +153,8 @@
 
             var slidingCurve = new DualSlidingCircleMinimumSafetyCurve
             {
+                ActiveCircleCenter = new CSharpWrapperPoint2D(0, 0),
+                PassiveCircleCenter = new CSharpWrapperPoint2D(1, 1),
                 Slices = new[]
                 {
                     new Slice