Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/CalculationServiceHelperTest.cs
===================================================================
diff -u -re2786bbbad5456a4b42b68e1d0b0f85f732393d7 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/CalculationServiceHelperTest.cs	(.../CalculationServiceHelperTest.cs)	(revision e2786bbbad5456a4b42b68e1d0b0f85f732393d7)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/CalculationServiceHelperTest.cs	(.../CalculationServiceHelperTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -232,17 +232,18 @@
         {
             // Setup
             const string message = "Message";
+            var exception = new Exception();
 
             // Call
-            Action call = () => CalculationServiceHelper.LogExceptionAsError(message, new Exception());
+            Action call = () => CalculationServiceHelper.LogExceptionAsError(message, exception);
 
             // Assert
             TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, tuples =>
             {
                 Tuple<string, Level, Exception> tuple = tuples.Single();
                 Assert.AreEqual(message, tuple.Item1);
                 Assert.AreEqual(Level.Error, tuple.Item2);
-                Assert.IsInstanceOf<Exception>(tuple.Item3);
+                Assert.AreSame(exception, tuple.Item3);
             });
         }
     }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputDaily.cs
===================================================================
diff -u -r18df5753718d7753b00cc3d40fde1a90a99b87ed -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputDaily.cs	(.../MacroStabilityInwardsLocationInputDaily.cs)	(revision 18df5753718d7753b00cc3d40fde1a90a99b87ed)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputDaily.cs	(.../MacroStabilityInwardsLocationInputDaily.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -29,6 +29,11 @@
     /// </summary>
     public class MacroStabilityInwardsLocationInputDaily : MacroStabilityInwardsLocationInput
     {
+        public MacroStabilityInwardsLocationInputDaily()
+        {
+            PenetrationLength = new RoundedDouble(2);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MacroStabilityInwardsLocationInputDaily"/> class.
         /// </summary>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlice.cs
===================================================================
diff -u -r340edd952c498a15d7386940d0c1201ddd989cb0 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlice.cs	(.../MacroStabilityInwardsSlice.cs)	(revision 340edd952c498a15d7386940d0c1201ddd989cb0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlice.cs	(.../MacroStabilityInwardsSlice.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -25,7 +25,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
-    /// The slice result of a macro stability calculation.
+    /// A slice of a macro stability inwards sliding curve.
     /// </summary>
     public class MacroStabilityInwardsSlice
     {
@@ -40,8 +40,8 @@
         /// of the new <see cref="MacroStabilityInwardsSlice"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public MacroStabilityInwardsSlice(Point2D topLeftPoint, Point2D topRightPoint,
-                                                Point2D bottomLeftPoint, Point2D bottomRightPoint,
-                                                ConstructionProperties properties)
+                                          Point2D bottomLeftPoint, Point2D bottomRightPoint,
+                                          ConstructionProperties properties)
         {
             if (topLeftPoint == null)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlidingCircle.cs
===================================================================
diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlidingCircle.cs	(.../MacroStabilityInwardsSlidingCircle.cs)	(revision 2c8c5eec330543aab5ece02da4159ce53cfde11b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlidingCircle.cs	(.../MacroStabilityInwardsSlidingCircle.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -25,7 +25,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
-    /// The sliding circle result of a macro stability calculation.
+    /// The macro stability inwards sliding circle.
     /// </summary>
     public class MacroStabilityInwardsSlidingCircle
     {
@@ -65,6 +65,7 @@
 
         /// <summary>
         /// Gets the radius of the circle.
+        /// [m]
         /// </summary>
         public double Radius { get; }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlidingCurve.cs
===================================================================
diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlidingCurve.cs	(.../MacroStabilityInwardsSlidingCurve.cs)	(revision 2c8c5eec330543aab5ece02da4159ce53cfde11b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlidingCurve.cs	(.../MacroStabilityInwardsSlidingCurve.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -25,7 +25,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
-    /// The sliding curve result of a macro stability calculation.
+    /// The macro stability inwards sliding curve.
     /// </summary>
     public class MacroStabilityInwardsSlidingCurve
     {
@@ -42,7 +42,7 @@
         /// <exception cref="ArgumentNullException">Thrown when any parameter
         /// is <c>null</c>.</exception>
         public MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircle leftCircle, MacroStabilityInwardsSlidingCircle rightCircle,
-                                                       IEnumerable<MacroStabilityInwardsSlice> slices, double nonIteratedHorizontalForce, double iteratedHorizontalForce)
+                                                 IEnumerable<MacroStabilityInwardsSlice> slices, double nonIteratedHorizontalForce, double iteratedHorizontalForce)
         {
             if (leftCircle == null)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlipPlaneUpliftVan.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlipPlaneUpliftVan.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVan.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlipPlaneUpliftVan.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVan.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -25,7 +25,7 @@
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
-    /// The Uplift Van calculation grid result of a macro stability calculation.
+    /// The Uplift Van calculation grid of a macro stability calculation.
     /// </summary>
     public class MacroStabilityInwardsSlipPlaneUpliftVan
     {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/IUpliftVanCalculator.cs
===================================================================
diff -u -r6d3eb061666110382fd3379594f4da711cc9ad1e -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/IUpliftVanCalculator.cs	(.../IUpliftVanCalculator.cs)	(revision 6d3eb061666110382fd3379594f4da711cc9ad1e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/IUpliftVanCalculator.cs	(.../IUpliftVanCalculator.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -48,6 +48,6 @@
         /// Performs the validation.
         /// </summary>
         /// <returns>A list of validation messages.</returns>
-        List<UpliftVanValidationResult> Validate();
+        IEnumerable<UpliftVanValidationResult> Validate();
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResult.cs
===================================================================
diff -u -r6d704f970fe97f343fe3b567661a9789a4f44fd9 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResult.cs	(.../UpliftVanSlidingCircleResult.cs)	(revision 6d704f970fe97f343fe3b567661a9789a4f44fd9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResult.cs	(.../UpliftVanSlidingCircleResult.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -66,6 +66,7 @@
 
         /// <summary>
         /// Gets the radius of the circle.
+        /// [m]
         /// </summary>
         public double Radius { get; }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCurveResult.cs
===================================================================
diff -u -r6d704f970fe97f343fe3b567661a9789a4f44fd9 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCurveResult.cs	(.../UpliftVanSlidingCurveResult.cs)	(revision 6d704f970fe97f343fe3b567661a9789a4f44fd9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCurveResult.cs	(.../UpliftVanSlidingCurveResult.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -39,8 +39,8 @@
         /// force of the curve.</param>
         /// <param name="iteratedHorizontalForce">The iterated horizontal force
         /// of the curve.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter
-        /// is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="leftCircle"/>,
+        /// <paramref name="rightCircle" /> or <paramref name="slices"/> is <c>null</c>.</exception>
         internal UpliftVanSlidingCurveResult(UpliftVanSlidingCircleResult leftCircle, UpliftVanSlidingCircleResult rightCircle,
                                              IEnumerable<UpliftVanSliceResult> slices, double nonIteratedHorizontalForce, double iteratedHorizontalForce)
         {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs
===================================================================
diff -u -r6d3eb061666110382fd3379594f4da711cc9ad1e -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision 6d3eb061666110382fd3379594f4da711cc9ad1e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs	(.../UpliftVanCalculator.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -62,7 +62,7 @@
             this.factory = factory;
         }
 
-        public List<UpliftVanValidationResult> Validate()
+        public IEnumerable<UpliftVanValidationResult> Validate()
         {
             try
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculatorException.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculatorException.cs	(.../UpliftVanCalculatorException.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculatorException.cs	(.../UpliftVanCalculatorException.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -25,7 +25,7 @@
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan
 {
     /// <summary>
-    /// The exception that is thrown when an error occurs while performing a calculation.
+    /// The exception that is thrown when an error occurs while performing an Uplift Van calculation.
     /// </summary>
     [Serializable]
     public class UpliftVanCalculatorException : Exception
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs
===================================================================
diff -u -r6d3eb061666110382fd3379594f4da711cc9ad1e -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision 6d3eb061666110382fd3379594f4da711cc9ad1e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs	(.../IUpliftVanKernel.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -137,7 +137,7 @@
         /// Performs the Uplift Van calculation.
         /// </summary>
         /// <exception cref="UpliftVanKernelWrapperException">Thrown when
-        /// an unexpected error occurs when performing the calculation.</exception>
+        /// an error occurs when performing the calculation.</exception>
         void Calculate();
 
         /// <summary>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -r6d3eb061666110382fd3379594f4da711cc9ad1e -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 6d3eb061666110382fd3379594f4da711cc9ad1e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -200,6 +200,12 @@
             }
         }
 
+        /// <summary>
+        /// Reads the calculation result.
+        /// </summary>
+        /// <param name="result">The result to read.</param>
+        /// <exception cref="UpliftVanKernelWrapperException">Thrown when the
+        /// calculation result contains error messages.</exception>
         private void ReadResult(string result)
         {
             StabilityAssessmentCalculationResult convertedResult = WTIDeserializer.DeserializeResult(result);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapperException.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapperException.cs	(.../UpliftVanKernelWrapperException.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapperException.cs	(.../UpliftVanKernelWrapperException.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -25,7 +25,7 @@
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan
 {
     /// <summary>
-    /// The exception that is thrown when an error occurs while performing the kernel calculation.
+    /// The exception that is thrown when an error occurs while performing the Uplift Van kernel calculation.
     /// </summary>
     [Serializable]
     public class UpliftVanKernelWrapperException : Exception
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -29,7 +29,7 @@
 {
     /// <summary>
     /// Converter to convert <see cref="UpliftVanCalculationGridResult"/>
-    /// into <see cref="MacroStabilityInwardsSlipPlaneUpliftVanConverter"/>.
+    /// into <see cref="MacroStabilityInwardsSlipPlaneUpliftVan"/>.
     /// </summary>
     internal static class MacroStabilityInwardsSlipPlaneUpliftVanConverter
     {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -ra4daa6d1ccb443d5ab7901f3ac8578dca7064476 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision a4daa6d1ccb443d5ab7901f3ac8578dca7064476)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -71,7 +71,7 @@
             UpliftVanCalculatorInput upliftVanCalculatorInput = CreateInputFromData(calculation.InputParameters);
             IUpliftVanCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateUpliftVanCalculator(upliftVanCalculatorInput, MacroStabilityInwardsKernelWrapperFactory.Instance);
 
-            List<UpliftVanValidationResult> validationResults = calculator.Validate();
+            UpliftVanValidationResult[] validationResults = calculator.Validate().ToArray();
 
             CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Error_in_validation_0,
                                                         validationResults.Where(msg => msg.ResultType == UpliftVanValidationResultType.Error)
@@ -92,6 +92,7 @@
         /// <param name="calculation">The <see cref="MacroStabilityInwardsCalculation"/> to base the input for the calculation upon.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/> is <c>null</c>.</exception>
         /// <remarks>Consider calling <see cref="Validate"/> first to see if calculation is possible.</remarks>
+        /// <exception cref="UpliftVanCalculatorException">Thrown when an error occurred during the calculation.</exception>
         public static void Calculate(MacroStabilityInwardsCalculation calculation)
         {
             if (calculation == null)
@@ -103,7 +104,9 @@
 
             try
             {
-                IUpliftVanCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateUpliftVanCalculator(CreateInputFromData(calculation.InputParameters), MacroStabilityInwardsKernelWrapperFactory.Instance);
+                IUpliftVanCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateUpliftVanCalculator(
+                    CreateInputFromData(calculation.InputParameters),
+                    MacroStabilityInwardsKernelWrapperFactory.Instance);
                 UpliftVanCalculatorResult macroStabilityInwardsResult = calculator.Calculate();
 
                 calculation.Output = new MacroStabilityInwardsOutput(
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj
===================================================================
diff -u -r72b7678303020aa97e09ff82e8e5f0d9d0232538 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj	(.../Ringtoets.MacroStabilityInwards.Service.csproj)	(revision 72b7678303020aa97e09ff82e8e5f0d9d0232538)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Ringtoets.MacroStabilityInwards.Service.csproj	(.../Ringtoets.MacroStabilityInwards.Service.csproj)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -111,7 +111,6 @@
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs	(.../MacroStabilityInwardsOutputTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs	(.../MacroStabilityInwardsOutputTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -83,26 +83,6 @@
         }
 
         [Test]
-        public void Constructor_WithParameters_ExpectedValues()
-        {
-            // Setup
-            var slidingCurve = new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(),
-                                                                     MacroStabilityInwardsSlidingCircleTestFactory.Create(),
-                                                                     new MacroStabilityInwardsSlice[0], 0, 0);
-
-            var slipPlane = new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridTestFactory.Create(),
-                                                                        MacroStabilityInwardsGridTestFactory.Create(),
-                                                                        new double[0]);
-
-            // Call
-            var output = new MacroStabilityInwardsOutput(slidingCurve, slipPlane, new MacroStabilityInwardsOutput.ConstructionProperties());
-
-            // Assert
-            Assert.AreSame(slidingCurve, output.SlidingCurve);
-            Assert.AreSame(slipPlane, output.SlipPlane);
-        }
-
-        [Test]
         public void Constructor_ConstructionPropertiesWithoutValuesSet_PropertiesAreDefault()
         {
             // Setup
@@ -157,6 +137,9 @@
             Assert.IsInstanceOf<Observable>(output);
             Assert.IsInstanceOf<ICalculationOutput>(output);
 
+            Assert.AreSame(slidingCurve, output.SlidingCurve);
+            Assert.AreSame(slipPlane, output.SlipPlane);
+
             Assert.AreEqual(factorOfStability, output.FactorOfStability);
             Assert.AreEqual(zValue, output.ZValue);
             Assert.AreEqual(xEntryMin, output.ForbiddenZonesXEntryMin);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlidingCurveTest.cs
===================================================================
diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlidingCurveTest.cs	(.../MacroStabilityInwardsSlidingCurveTest.cs)	(revision 2c8c5eec330543aab5ece02da4159ce53cfde11b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlidingCurveTest.cs	(.../MacroStabilityInwardsSlidingCurveTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -82,7 +82,7 @@
             var slices = new[]
             {
                 new MacroStabilityInwardsSlice(new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0),
-                                                     new MacroStabilityInwardsSlice.ConstructionProperties())
+                                               new MacroStabilityInwardsSlice.ConstructionProperties())
             };
 
             double nonIteratedHorizontalForce = random.NextDouble();
@@ -96,7 +96,7 @@
             Assert.AreSame(rightCircle, curve.RightCircle);
             Assert.AreEqual(nonIteratedHorizontalForce, curve.NonIteratedHorizontalForce);
             Assert.AreEqual(iteratedHorizontalForce, curve.IteratedHorizontalForce);
-            CollectionAssert.AreEqual(slices, curve.Slices);
+            Assert.AreSame(slices, curve.Slices);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -92,7 +92,7 @@
             // Assert
             Assert.AreSame(leftGrid, result.LeftGrid);
             Assert.AreSame(rightGrid, result.RightGrid);
-            CollectionAssert.AreEqual(tangentLines, result.TangentLines);
+            Assert.AreSame(tangentLines, result.TangentLines);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -62,6 +62,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Segment2DLoopCollectionHelperTest.cs" />
     <Compile Include="TestMacroStabilityInwardsFailureMechanismTest.cs" />
+    <Compile Include="TestMacroStabilityInwardsOutputTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestMacroStabilityInwardsOutputTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestMacroStabilityInwardsOutputTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestMacroStabilityInwardsOutputTest.cs	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.Test
+{
+    [TestFixture]
+    public class TestMacroStabilityInwardsOutputTest
+    {
+        [Test]
+        public void ParameterlessConstructor_ExpectedValues()
+        {
+            // Call
+            var output = new TestMacroStabilityInwardsOutput();
+
+            // Assert
+            Assert.IsInstanceOf<MacroStabilityInwardsOutput>(output);
+            Assert.AreEqual(1.1, output.FactorOfStability);
+            Assert.IsNotNull(output.SlidingCurve);
+            Assert.IsNotNull(output.SlipPlane);
+        }
+
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(11);
+            double factorOfStability = random.NextDouble();
+            double zValue = random.NextDouble();
+            double forbiddenZonesXEntryMax = random.NextDouble();
+            double forbiddenZonesXEntryMin = random.NextDouble();
+
+            var properties = new MacroStabilityInwardsOutput.ConstructionProperties
+            {
+                FactorOfStability = factorOfStability,
+                ZValue = zValue,
+                ForbiddenZonesXEntryMax = forbiddenZonesXEntryMax,
+                ForbiddenZonesXEntryMin = forbiddenZonesXEntryMin
+            };
+
+            // Call
+            var output = new TestMacroStabilityInwardsOutput(properties);
+
+            // Assert
+            Assert.IsInstanceOf<MacroStabilityInwardsOutput>(output);
+            Assert.AreEqual(factorOfStability, output.FactorOfStability);
+            Assert.AreEqual(zValue, output.ZValue);
+            Assert.AreEqual(forbiddenZonesXEntryMax, output.ForbiddenZonesXEntryMax);
+            Assert.AreEqual(forbiddenZonesXEntryMin, output.ForbiddenZonesXEntryMin);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs	(.../TestMacroStabilityInwardsOutput.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs	(.../TestMacroStabilityInwardsOutput.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+
 namespace Ringtoets.MacroStabilityInwards.Data.TestUtil
 {
     /// <summary>
@@ -27,22 +29,29 @@
     /// <seealso cref="MacroStabilityInwardsOutput" />
     public class TestMacroStabilityInwardsOutput : MacroStabilityInwardsOutput
     {
+        /// <summary>
+        /// Creates a new instance of <see cref="TestMacroStabilityInwardsOutput"/>.
+        /// </summary>
         public TestMacroStabilityInwardsOutput()
             : this(new ConstructionProperties
-                   {
-                       FactorOfStability = 1.1
-                   }) {}
+            {
+                FactorOfStability = 1.1
+            }) {}
 
+        /// <summary>
+        /// Creates a new instance of <see cref="TestMacroStabilityInwardsOutput"/>.
+        /// </summary>
+        /// <param name="properties">The container of the properties for the
+        /// <see cref="TestMacroStabilityInwardsOutput"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="properties"/>
+        /// is <c>null</c>.</exception>
         public TestMacroStabilityInwardsOutput(ConstructionProperties properties)
-            : base (new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(),
+            : base(new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(),
                                                          MacroStabilityInwardsSlidingCircleTestFactory.Create(),
                                                          new MacroStabilityInwardsSlice[0], 0, 0),
                    new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridTestFactory.Create(),
                                                                MacroStabilityInwardsGridTestFactory.Create(),
                                                                new double[0]),
-                   properties)
-        {
-            
-        }
+                   properties) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs
===================================================================
diff -u -rb57514896ac9566e5d0262cf66a37847ceb07eeb -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs	(.../MacroStabilityInwardsOutputContextPropertiesTest.cs)	(revision b57514896ac9566e5d0262cf66a37847ceb07eeb)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs	(.../MacroStabilityInwardsOutputContextPropertiesTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -77,8 +77,10 @@
                 Data = new MacroStabilityInwardsOutputContext(output, semiProbabilisticOutput)
             };
 
-            // Call & Assert
-            Assert.AreEqual(new RoundedDouble(3, macroStabilityInwardsFactorOfStability), properties.MacroStabilityInwardsFactorOfStability);
+            // Assert
+            Assert.AreEqual(3, properties.MacroStabilityInwardsFactorOfStability.NumberOfDecimalPlaces);
+            Assert.AreEqual(macroStabilityInwardsFactorOfStability, properties.MacroStabilityInwardsFactorOfStability,
+                                       properties.MacroStabilityInwardsFactorOfStability.GetAccuracy());
 
             const string probabilityFormat = "1/{0:n0}";
             Assert.AreEqual(string.Format(probabilityFormat, 1.0 / requiredProbability), properties.RequiredProbability);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculatorResultTest.cs
===================================================================
diff -u -r19150f985431c9805d687eebb4505e440784acb6 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculatorResultTest.cs	(.../UpliftVanCalculatorResultTest.cs)	(revision 19150f985431c9805d687eebb4505e440784acb6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculatorResultTest.cs	(.../UpliftVanCalculatorResultTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -33,13 +33,8 @@
         [Test]
         public void Constructor_SlidingCurveResultNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var calculationGridResult = new UpliftVanCalculationGridResult(UpliftVanGridTestFactory.Create(),
-                                                                           UpliftVanGridTestFactory.Create(),
-                                                                           new double[0]);
-
             // Call
-            TestDelegate call = () => new UpliftVanCalculatorResult(null, calculationGridResult, new UpliftVanCalculatorResult.ConstructionProperties());
+            TestDelegate call = () => new UpliftVanCalculatorResult(null, CreateGridResult(), new UpliftVanCalculatorResult.ConstructionProperties());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -65,12 +60,9 @@
         {
             // Setup
             UpliftVanSlidingCurveResult slidingCurveResult = UpliftVanSlidingCurveResultTestFactory.Create();
-            var calculationGridResult = new UpliftVanCalculationGridResult(UpliftVanGridTestFactory.Create(),
-                                                                           UpliftVanGridTestFactory.Create(),
-                                                                           new double[0]);
 
             // Call
-            TestDelegate call = () => new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, null);
+            TestDelegate call = () => new UpliftVanCalculatorResult(slidingCurveResult, CreateGridResult(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -82,9 +74,7 @@
         {
             // Setup
             UpliftVanSlidingCurveResult slidingCurveResult = UpliftVanSlidingCurveResultTestFactory.Create();
-            var calculationGridResult = new UpliftVanCalculationGridResult(UpliftVanGridTestFactory.Create(),
-                                                                           UpliftVanGridTestFactory.Create(),
-                                                                           new double[0]);
+            UpliftVanCalculationGridResult calculationGridResult = CreateGridResult();
 
             // Call
             var result = new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, new UpliftVanCalculatorResult.ConstructionProperties());
@@ -99,12 +89,9 @@
         {
             // Setup
             UpliftVanSlidingCurveResult slidingCurveResult = UpliftVanSlidingCurveResultTestFactory.Create();
-            var calculationGridResult = new UpliftVanCalculationGridResult(UpliftVanGridTestFactory.Create(),
-                                                                           UpliftVanGridTestFactory.Create(),
-                                                                           new double[0]);
 
             // Call
-            var result = new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, new UpliftVanCalculatorResult.ConstructionProperties());
+            var result = new UpliftVanCalculatorResult(slidingCurveResult, CreateGridResult(), new UpliftVanCalculatorResult.ConstructionProperties());
 
             // Assert
             Assert.IsNaN(result.FactorOfStability);
@@ -132,18 +119,22 @@
             };
 
             UpliftVanSlidingCurveResult slidingCurveResult = UpliftVanSlidingCurveResultTestFactory.Create();
-            var calculationGridResult = new UpliftVanCalculationGridResult(UpliftVanGridTestFactory.Create(),
-                                                                           UpliftVanGridTestFactory.Create(),
-                                                                           new double[0]);
 
             // Call
-            var result = new UpliftVanCalculatorResult(slidingCurveResult, calculationGridResult, constructionProperties);
+            var result = new UpliftVanCalculatorResult(slidingCurveResult, CreateGridResult(), constructionProperties);
 
             // Assert
             Assert.AreEqual(factorOfStability, result.FactorOfStability);
             Assert.AreEqual(zValue, result.ZValue);
             Assert.AreEqual(xEntryMin, result.ForbiddenZonesXEntryMin);
             Assert.AreEqual(xEntryMax, result.ForbiddenZonesXEntryMax);
         }
+
+        private static UpliftVanCalculationGridResult CreateGridResult()
+        {
+            return new UpliftVanCalculationGridResult(UpliftVanGridTestFactory.Create(),
+                                                      UpliftVanGridTestFactory.Create(),
+                                                      new double[0]);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r6d3eb061666110382fd3379594f4da711cc9ad1e -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 6d3eb061666110382fd3379594f4da711cc9ad1e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -183,7 +183,7 @@
             var testMacroStabilityInwardsKernelFactory = new TestMacroStabilityInwardsKernelFactory();
 
             UpliftVanKernelStub upliftVanKernel = testMacroStabilityInwardsKernelFactory.LastCreatedUpliftVanKernel;
-            SetCompleteKernelOutput(upliftVanKernel);
+//            SetCompleteKernelOutput(upliftVanKernel);
             upliftVanKernel.ThrowExceptionOnCalculate = true;
 
             // Call
@@ -203,7 +203,7 @@
             var testMacroStabilityInwardsKernelFactory = new TestMacroStabilityInwardsKernelFactory();
 
             // Call
-            List<UpliftVanValidationResult> validationResult = new UpliftVanCalculator(input, testMacroStabilityInwardsKernelFactory).Validate();
+            IEnumerable<UpliftVanValidationResult> validationResult = new UpliftVanCalculator(input, testMacroStabilityInwardsKernelFactory).Validate();
 
             // Assert
             CollectionAssert.IsEmpty(validationResult);
@@ -218,10 +218,10 @@
             upliftVanKernel.ReturnValidationResults = true;
 
             // Call
-            List<UpliftVanValidationResult> results = new UpliftVanCalculator(CreateValidCalculatorInput(), testMacroStabilityInwardsKernelFactory).Validate();
+            IEnumerable<UpliftVanValidationResult> results = new UpliftVanCalculator(CreateValidCalculatorInput(), testMacroStabilityInwardsKernelFactory).Validate();
 
             // Assert
-            Assert.AreEqual(2, results.Count);
+            Assert.AreEqual(2, results.Count());
             Assert.AreEqual("Validation Warning", results.ElementAt(0).Message);
             Assert.AreEqual(UpliftVanValidationResultType.Warning, results.ElementAt(0).ResultType);
             Assert.AreEqual("Validation Error", results.ElementAt(1).Message);
@@ -373,8 +373,7 @@
             upliftVanKernel.ZValue = random.NextDouble();
             upliftVanKernel.ForbiddenZonesXEntryMax = random.NextDouble();
             upliftVanKernel.ForbiddenZonesXEntryMin = random.NextDouble();
-            upliftVanKernel.SlidingCurveResult = CreateSlidingDualCircle();
-            upliftVanKernel.SlipPlaneResult = CreateSlipPlaneUpliftVan();
+            SetValidKernelOutput(upliftVanKernel);
         }
 
         private static SlipPlaneUpliftVan CreateSlipPlaneUpliftVan()
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -r0b21aa321e05e40b31eb5ace3adc8bb9cebea68d -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 0b21aa321e05e40b31eb5ace3adc8bb9cebea68d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -50,6 +50,67 @@
         }
 
         [Test]
+        public void Constructor_CompleteInput_InputCorrectlySetToWrappedKernel()
+        {
+            // Setup
+            var random = new Random(21);
+            var soilModel = new SoilModel();
+            var soilProfile2D = new SoilProfile2D();
+            var stabilityLocation = new StabilityLocation();
+            var surfaceLine = new SurfaceLine2();
+            double maximumSliceWidth = random.NextDouble();
+            var slipPlaneUpliftVan = new SlipPlaneUpliftVan();
+            bool moveGrid = random.NextBoolean();
+            bool gridAutomaticDetermined = random.NextBoolean();
+            bool createZones = random.NextBoolean();
+            bool automaticForbiddenZones = random.NextBoolean();
+            double slipPlaneMinimumDepth = random.NextDouble();
+            double slipPlaneMinimumLength = random.NextDouble();
+
+            // Call
+            var kernel = new UpliftVanKernelWrapper
+            {
+                SoilModel = soilModel,
+                SoilProfile = soilProfile2D,
+                Location = stabilityLocation,
+                SurfaceLine = surfaceLine,
+                MaximumSliceWidth = maximumSliceWidth,
+                SlipPlaneUpliftVan = slipPlaneUpliftVan,
+                MoveGrid = moveGrid,
+                GridAutomaticDetermined = gridAutomaticDetermined,
+                CreateZones = createZones,
+                AutomaticForbiddenZones = automaticForbiddenZones,
+                SlipPlaneMinimumDepth = slipPlaneMinimumDepth,
+                SlipPlaneMinimumLength = slipPlaneMinimumLength
+            };
+
+            // Assert
+            var stabilityModel = TypeUtils.GetField<StabilityModel>(kernel, "stabilityModel");
+
+            Assert.IsNull(stabilityModel.LocationDaily);
+            Assert.IsNotNull(stabilityModel.SlipPlaneConstraints);
+            Assert.AreEqual(GridOrientation.Inwards, stabilityModel.GridOrientation);
+            Assert.IsNotNull(stabilityModel.SlipCircle);
+            Assert.AreEqual(SearchAlgorithm.Grid, stabilityModel.SearchAlgorithm);
+            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.ModelOption);
+            Assert.AreSame(surfaceLine, stabilityModel.SurfaceLine2);
+            Assert.AreSame(stabilityLocation, stabilityModel.Location);
+            Assert.AreSame(soilModel, stabilityModel.SoilModel);
+            Assert.AreSame(soilProfile2D, stabilityModel.SoilProfile);
+            Assert.AreEqual(maximumSliceWidth, stabilityModel.MaximumSliceWidth);
+            Assert.AreSame(slipPlaneUpliftVan, stabilityModel.SlipPlaneUpliftVan);
+            Assert.AreEqual(moveGrid, stabilityModel.MoveGrid);
+            Assert.AreEqual(gridAutomaticDetermined, stabilityModel.SlipCircle.Auto);
+            Assert.AreEqual(createZones, stabilityModel.SlipPlaneConstraints.CreateZones);
+            Assert.AreEqual(automaticForbiddenZones, stabilityModel.SlipPlaneConstraints.AutomaticForbiddenZones);
+            Assert.AreEqual(slipPlaneMinimumDepth, stabilityModel.SlipPlaneConstraints.SlipPlaneMinDepth);
+            Assert.AreEqual(slipPlaneMinimumLength, stabilityModel.SlipPlaneConstraints.SlipPlaneMinLength);
+
+            AssertIrrelevantValues(stabilityModel);
+            AssertAutomaticallySyncedValues(stabilityModel, soilProfile2D, surfaceLine);
+        }
+
+        [Test]
         public void Calculate_ExceptionInWrappedKernel_ThrowsUpliftVanKernelWrapperException()
         {
             // Setup
@@ -158,64 +219,22 @@
         }
 
         [Test]
-        public void Constructor_CompleteInput_InputCorrectlySetToWrappedKernel()
+        public void Calculate_ExceptionDuringCalculation_OutputPropertiesNotSet()
         {
             // Setup
-            var random = new Random(21);
-            var soilModel = new SoilModel();
-            var soilProfile2D = new SoilProfile2D();
-            var stabilityLocation = new StabilityLocation();
-            var surfaceLine = new SurfaceLine2();
-            double maximumSliceWidth = random.NextDouble();
-            var slipPlaneUpliftVan = new SlipPlaneUpliftVan();
-            bool moveGrid = random.NextBoolean();
-            bool gridAutomaticDetermined = random.NextBoolean();
-            bool createZones = random.NextBoolean();
-            bool automaticForbiddenZones = random.NextBoolean();
-            double slipPlaneMinimumDepth = random.NextDouble();
-            double slipPlaneMinimumLength = random.NextDouble();
+            var kernel = new UpliftVanKernelWrapper();
 
             // Call
-            var kernel = new UpliftVanKernelWrapper
-            {
-                SoilModel = soilModel,
-                SoilProfile = soilProfile2D,
-                Location = stabilityLocation,
-                SurfaceLine = surfaceLine,
-                MaximumSliceWidth = maximumSliceWidth,
-                SlipPlaneUpliftVan = slipPlaneUpliftVan,
-                MoveGrid = moveGrid,
-                GridAutomaticDetermined = gridAutomaticDetermined,
-                CreateZones = createZones,
-                AutomaticForbiddenZones = automaticForbiddenZones,
-                SlipPlaneMinimumDepth = slipPlaneMinimumDepth,
-                SlipPlaneMinimumLength = slipPlaneMinimumLength
-            };
+            TestDelegate test = () => kernel.Calculate();
 
             // Assert
-            var stabilityModel = TypeUtils.GetField<StabilityModel>(kernel, "stabilityModel");
-
-            Assert.IsNull(stabilityModel.LocationDaily);
-            Assert.IsNotNull(stabilityModel.SlipPlaneConstraints);
-            Assert.AreEqual(GridOrientation.Inwards, stabilityModel.GridOrientation);
-            Assert.IsNotNull(stabilityModel.SlipCircle);
-            Assert.AreEqual(SearchAlgorithm.Grid, stabilityModel.SearchAlgorithm);
-            Assert.AreEqual(ModelOptions.UpliftVan, stabilityModel.ModelOption);
-            Assert.AreSame(surfaceLine, stabilityModel.SurfaceLine2);
-            Assert.AreSame(stabilityLocation, stabilityModel.Location);
-            Assert.AreSame(soilModel, stabilityModel.SoilModel);
-            Assert.AreSame(soilProfile2D, stabilityModel.SoilProfile);
-            Assert.AreEqual(maximumSliceWidth, stabilityModel.MaximumSliceWidth);
-            Assert.AreSame(slipPlaneUpliftVan, stabilityModel.SlipPlaneUpliftVan);
-            Assert.AreEqual(moveGrid, stabilityModel.MoveGrid);
-            Assert.AreEqual(gridAutomaticDetermined, stabilityModel.SlipCircle.Auto);
-            Assert.AreEqual(createZones, stabilityModel.SlipPlaneConstraints.CreateZones);
-            Assert.AreEqual(automaticForbiddenZones, stabilityModel.SlipPlaneConstraints.AutomaticForbiddenZones);
-            Assert.AreEqual(slipPlaneMinimumDepth, stabilityModel.SlipPlaneConstraints.SlipPlaneMinDepth);
-            Assert.AreEqual(slipPlaneMinimumLength, stabilityModel.SlipPlaneConstraints.SlipPlaneMinLength);
-
-            AssertIrrelevantValues(stabilityModel);
-            AssertAutomaticallySyncedValues(stabilityModel, soilProfile2D, surfaceLine);
+            Assert.Throws<UpliftVanKernelWrapperException>(test);
+            Assert.IsNaN(kernel.FactorOfStability);
+            Assert.IsNaN(kernel.ZValue);
+            Assert.IsNaN(kernel.ForbiddenZonesXEntryMax);
+            Assert.IsNaN(kernel.ForbiddenZonesXEntryMin);
+            Assert.IsNull(kernel.SlidingCurveResult);
+            Assert.IsNull(kernel.SlipPlaneResult);
         }
 
         [Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/UpliftVanCalculatorStubTest.cs
===================================================================
diff -u -r8178a27b7fa97e2d70728d8735ae76b59c4ce697 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/UpliftVanCalculatorStubTest.cs	(.../UpliftVanCalculatorStubTest.cs)	(revision 8178a27b7fa97e2d70728d8735ae76b59c4ce697)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/UpliftVanCalculatorStubTest.cs	(.../UpliftVanCalculatorStubTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -90,7 +90,7 @@
             var calculator = new UpliftVanCalculatorStub();
 
             // Call
-            List<UpliftVanValidationResult> result = calculator.Validate();
+            IEnumerable<UpliftVanValidationResult> result = calculator.Validate();
 
             // Assert
             CollectionAssert.IsEmpty(result);
@@ -107,10 +107,10 @@
             };
 
             // Call
-            List<UpliftVanValidationResult> results = calculator.Validate();
+            IEnumerable<UpliftVanValidationResult> results = calculator.Validate();
 
             // Assert
-            Assert.AreEqual(2, results.Count);
+            Assert.AreEqual(2, results.Count());
             Assert.AreEqual("Validation Error", results.ElementAt(0).Message);
             Assert.AreEqual(UpliftVanValidationResultType.Error, results.ElementAt(0).ResultType);
             Assert.AreEqual("Validation Warning", results.ElementAt(1).Message);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/UpliftVanCalculatorStub.cs
===================================================================
diff -u -r8178a27b7fa97e2d70728d8735ae76b59c4ce697 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/UpliftVanCalculatorStub.cs	(.../UpliftVanCalculatorStub.cs)	(revision 8178a27b7fa97e2d70728d8735ae76b59c4ce697)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/UpliftVanCalculatorStub.cs	(.../UpliftVanCalculatorStub.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -52,7 +52,7 @@
             return Output ?? (Output = CreateUpliftVanCalculatorResult());
         }
 
-        public List<UpliftVanValidationResult> Validate()
+        public IEnumerable<UpliftVanValidationResult> Validate()
         {
             var validationResults = new List<UpliftVanValidationResult>();
             if (ReturnValidationError)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -ra4daa6d1ccb443d5ab7901f3ac8578dca7064476 -r0f736d81afe800a482dff027fe93128a5e967114
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision a4daa6d1ccb443d5ab7901f3ac8578dca7064476)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 0f736d81afe800a482dff027fe93128a5e967114)
@@ -381,24 +381,6 @@
         }
 
         [Test]
-        public void Calculate_ValidCalculationNoOutput_ShouldSetOutput()
-        {
-            // Setup
-            using (new MacroStabilityInwardsCalculatorFactoryConfig())
-            {
-                // Precondition
-                Assert.IsNull(testCalculation.Output);
-                Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(testCalculation));
-
-                // Call
-                MacroStabilityInwardsCalculationService.Calculate(testCalculation);
-
-                // Assert
-                Assert.IsNotNull(testCalculation.Output);
-            }
-        }
-
-        [Test]
         public void Calculate_ValidCalculationWithOutput_ShouldChangeOutput()
         {
             // Setup
@@ -578,6 +560,7 @@
                     Assert.IsInstanceOf<UpliftVanCalculatorException>(tuple.Item3);
                 });
                 Assert.IsTrue(exceptionThrown);
+                Assert.IsNull(testCalculation.Output);
             }
         }