Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r65499de962e73adf616561841c1aedabeaadf700 -rc313fab05ba3304bdd85780ef802432d48eb6ff5
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 65499de962e73adf616561841c1aedabeaadf700)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision c313fab05ba3304bdd85780ef802432d48eb6ff5)
@@ -188,8 +188,8 @@
                 Assert.AreEqual(upliftVanKernel.FactorOfStability, result.FactorOfStability);
                 Assert.AreEqual(upliftVanKernel.ForbiddenZonesXEntryMax, result.ForbiddenZonesXEntryMax);
                 Assert.AreEqual(upliftVanKernel.ForbiddenZonesXEntryMin, result.ForbiddenZonesXEntryMin);
-                UpliftVanCalculatorOutputAssert.AssertSlidingCurve(UpliftVanSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
-                                                                   result.SlidingCurveResult);
+                UpliftVanCalculatorOutputAssert.AssertUpliftVanSlidingCurveResult(UpliftVanSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
+                                                                                  result.SlidingCurveResult);
                 UpliftVanCalculatorOutputAssert.AssertUpliftVanCalculationGridResult(UpliftVanCalculationGridResultCreator.Create(upliftVanKernel.UpliftVanCalculationGridResult),
                                                                                      result.CalculationGridResult);
             }
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -rc54a379def1546f3938d79362ed6eb6ee9140f97 -rc313fab05ba3304bdd85780ef802432d48eb6ff5
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision c54a379def1546f3938d79362ed6eb6ee9140f97)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision c313fab05ba3304bdd85780ef802432d48eb6ff5)
@@ -134,16 +134,15 @@
         }
 
         [Test]
-        public void Calculate_CalculationNotSuccessful_OutputSet()
+        public void Calculate_CalculationNotSuccessful_ThrowsUpliftVanKernelWrapperException()
         {
             // Setup
-            var random = new Random(21);
             var calculatorOutput = new MacroStabilityOutput
             {
                 StabilityOutput = new StabilityOutput
                 {
                     Succeeded = false,
-                    Messages = new []
+                    Messages = new[]
                     {
                         MessageHelper.CreateMessage(MessageType.Error, "Message 1"),
                         MessageHelper.CreateMessage(MessageType.Error, "Message 2")
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs
===================================================================
diff -u -r7f33bc9c1e8b6a3712729dea8c783977300481eb -rc313fab05ba3304bdd85780ef802432d48eb6ff5
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision 7f33bc9c1e8b6a3712729dea8c783977300481eb)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision c313fab05ba3304bdd85780ef802432d48eb6ff5)
@@ -220,7 +220,7 @@
             var exception = Assert.Throws<WaternetKernelWrapperException>(Call);
             string expectedMessage = $"{message1}{Environment.NewLine}" +
                                      $"{message2}";
-                                     Assert.AreEqual(expectedMessage, exception.Message);
+            Assert.AreEqual(expectedMessage, exception.Message);
             mocks.VerifyAll();
         }
 
@@ -250,7 +250,7 @@
         }
 
         [Test]
-        public void Validate_ExceptionInWrappedKernel_ThrowsUpliftVanKernelWrapperException()
+        public void Validate_ExceptionInWrappedKernel_ThrowsWaternetKernelWrapperException()
         {
             // Setup
             var exceptionToThrow = new Exception();
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputAssert.cs
===================================================================
diff -u -rd1c3ff0afd7217b6217372c6466d6d1a5428a491 -rc313fab05ba3304bdd85780ef802432d48eb6ff5
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputAssert.cs	(.../UpliftVanCalculatorOutputAssert.cs)	(revision d1c3ff0afd7217b6217372c6466d6d1a5428a491)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/Output/UpliftVanCalculatorOutputAssert.cs	(.../UpliftVanCalculatorOutputAssert.cs)	(revision c313fab05ba3304bdd85780ef802432d48eb6ff5)
@@ -38,13 +38,13 @@
         /// <param name="actual">The actual <see cref="UpliftVanSlidingCurveResult"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertSlidingCurve(UpliftVanSlidingCurveResult expected, UpliftVanSlidingCurveResult actual)
+        public static void AssertUpliftVanSlidingCurveResult(UpliftVanSlidingCurveResult expected, UpliftVanSlidingCurveResult actual)
         {
             Assert.AreEqual(expected.IteratedHorizontalForce, actual.IteratedHorizontalForce);
             Assert.AreEqual(expected.NonIteratedHorizontalForce, actual.NonIteratedHorizontalForce);
-            AssertCircle(expected.LeftCircle, actual.LeftCircle);
-            AssertCircle(expected.RightCircle, actual.RightCircle);
-            AssertSlices(expected.Slices.ToArray(), actual.Slices.ToArray());
+            AssertUpliftVanSlidingCircleResult(expected.LeftCircle, actual.LeftCircle);
+            AssertUpliftVanSlidingCircleResult(expected.RightCircle, actual.RightCircle);
+            AssertUpliftVanSliceResults(expected.Slices.ToArray(), actual.Slices.ToArray());
         }
 
         /// <summary>
@@ -57,8 +57,8 @@
         public static void AssertUpliftVanCalculationGridResult(UpliftVanCalculationGridResult expected, UpliftVanCalculationGridResult actual)
         {
             CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines);
-            AssertGrid(expected.LeftGrid, actual.LeftGrid);
-            AssertGrid(expected.RightGrid, actual.RightGrid);
+            AssertUpliftVanGrid(expected.LeftGrid, actual.LeftGrid);
+            AssertUpliftVanGrid(expected.RightGrid, actual.RightGrid);
         }
 
         /// <summary>
@@ -68,7 +68,7 @@
         /// <param name="actual">The actual <see cref="UpliftVanSlidingCircleResult"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertCircle(UpliftVanSlidingCircleResult expected, UpliftVanSlidingCircleResult actual)
+        private static void AssertUpliftVanSlidingCircleResult(UpliftVanSlidingCircleResult expected, UpliftVanSlidingCircleResult actual)
         {
             Assert.AreEqual(expected.Center, actual.Center);
             Assert.AreEqual(expected.Radius, actual.Radius);
@@ -86,7 +86,7 @@
         /// <param name="actual">The actual <see cref="UpliftVanSliceResult"/> array.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertSlices(UpliftVanSliceResult[] expected, UpliftVanSliceResult[] actual)
+        private static void AssertUpliftVanSliceResults(UpliftVanSliceResult[] expected, UpliftVanSliceResult[] actual)
         {
             Assert.AreEqual(expected.Length, actual.Length);
 
@@ -131,7 +131,7 @@
         /// <param name="actual">The actual <see cref="UpliftVanGrid"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertGrid(UpliftVanGrid expected, UpliftVanGrid actual)
+        private static void AssertUpliftVanGrid(UpliftVanGrid expected, UpliftVanGrid actual)
         {
             Assert.AreEqual(expected.XLeft, actual.XLeft);
             Assert.AreEqual(expected.XRight, actual.XRight);