Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -r44f821c9dc2c2355637eaa3175832f8c3c85ed32 -r8002b84b48541385e95fb53c4330fcdb5e800649
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 44f821c9dc2c2355637eaa3175832f8c3c85ed32)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 8002b84b48541385e95fb53c4330fcdb5e800649)
@@ -267,6 +267,7 @@
         private void SetResults()
         {
             StabilityModel stabilityModel = kernelModel.StabilityModel;
+            StabilityOutputModel stabilityOutputModel = kernelModel.StabilityOutputModel;
             FactorOfStability = stabilityModel.MinimumSafetyCurve.SafetyFactor;
             ForbiddenZonesXEntryMin = stabilityModel.SlipPlaneConstraints.XLeftMin;
             ForbiddenZonesXEntryMax = stabilityModel.SlipPlaneConstraints.XLeftMax;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -r64553ee5bb2b3c27b0bcfa5eb79aec9e75b9942b -r8002b84b48541385e95fb53c4330fcdb5e800649
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 64553ee5bb2b3c27b0bcfa5eb79aec9e75b9942b)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 8002b84b48541385e95fb53c4330fcdb5e800649)
@@ -28,6 +28,7 @@
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.Kernel;
+using Deltares.MacroStability.Preprocessing;
 using Deltares.MacroStability.Standard;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
@@ -112,8 +113,11 @@
 
             // Assert
             var kernelModel = TypeUtils.GetField<KernelModel>(kernel, "kernelModel");
-            StabilityModel stabilityModel = kernelModel.StabilityModel;
+            
+            AssertStabilityOutputModel(kernelModel.StabilityOutputModel);
+            AssertPreProcessingModel(kernelModel.PreprocessingModel);
 
+            StabilityModel stabilityModel = kernelModel.StabilityModel;
             CollectionAssert.AreEqual(soilModel, kernelModel.StabilityModel.Soils);
             Assert.AreEqual(moveGrid, stabilityModel.MoveGrid);
             Assert.AreEqual(maximumSliceWidth, stabilityModel.MaximumSliceWidth);
@@ -492,11 +496,38 @@
 
         private static void AssertIrrelevantValues(StabilityModel stabilityModel)
         {
+            Assert.IsNotNull(stabilityModel.BeeswarmOptions);
+            Assert.IsNotNull(stabilityModel.SpencerSlipPlanes);
+            Assert.IsNotNull(stabilityModel.LevenbergMarquardtOptions);
             Assert.IsNull(stabilityModel.MinimumSafetyCurve); // Output
             Assert.AreEqual(0.8, stabilityModel.RequiredForcePointsInSlices); // Only for Spencer
             Assert.AreEqual(60.0, stabilityModel.MaxAllowedAngleBetweenSlices); // Only for Spencer
+            Assert.AreEqual(9.81, stabilityModel.UnitWeightWater);
+            Assert.AreEqual(2, stabilityModel.TraversalGridPoints);
+            Assert.AreEqual(50, stabilityModel.MaxGridMoves);
+            Assert.IsNotNull(stabilityModel.Validator);
+            Assert.AreEqual(0, stabilityModel.TraversalRefinements);
+            Assert.IsFalse(stabilityModel.FinalizeWithLevenbergMarquardt);
             Assert.IsNotNull(stabilityModel.GeneticAlgorithmOptions); // Only for genetic search algorithm
             Assert.IsNotNull(stabilityModel.LevenbergMarquardtOptions); // Only for Levenberg Marquardt search algorithm
         }
+
+        private static void AssertPreProcessingModel(PreprocessingModel preProcessingModel)
+        {
+            Assert.AreEqual(Enumerable.Empty<LogMessage>(), preProcessingModel.LogMessages);
+            Assert.AreEqual(preProcessingModel.StabilityModel, preProcessingModel.StabilityModel);
+        }
+
+        private static void AssertStabilityOutputModel(StabilityOutputModel stabilityOutputModel)
+        {
+            Assert.AreEqual(Enumerable.Empty<LogMessage>(), stabilityOutputModel.LogMessages);
+            Assert.AreEqual(ModelOptions.Bishop, stabilityOutputModel.ModelOption);
+            Assert.IsFalse(stabilityOutputModel.Succeeded);
+            Assert.AreEqual(0.0, stabilityOutputModel.SafetyFactor);
+            Assert.AreEqual(0.0, stabilityOutputModel.ZValue);
+            Assert.IsNull(stabilityOutputModel.MinimumSlidingCurve);
+            Assert.IsNotNull(stabilityOutputModel.VersionInfo);
+            Assert.IsNotNull(stabilityOutputModel.PreProcessingOutput);
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs
===================================================================
diff -u -rb0f48dfc1d667e2340732cd120355e75d01052b0 -r8002b84b48541385e95fb53c4330fcdb5e800649
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision b0f48dfc1d667e2340732cd120355e75d01052b0)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs	(.../WaternetKernelWrapperTest.cs)	(revision 8002b84b48541385e95fb53c4330fcdb5e800649)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Linq;
 using Core.Common.Util.Reflection;
 using Deltares.MacroStability.Geometry;
 using Deltares.MacroStability.Standard;
@@ -61,7 +62,7 @@
             kernel.SetSurfaceLine(surfaceLine);
 
             // Assert
-            var waternetCreator = TypeUtils.GetProperty<WaternetCreator>(kernel, "waternetCreator");
+            var waternetCreator = TypeUtils.GetField<WaternetCreator>(kernel, "waternetCreator");
 
             Assert.AreSame(surfaceLine, location.Surfaceline);
             Assert.AreSame(soilProfile2D, location.SoilProfile2D);
@@ -88,10 +89,10 @@
         {
             Assert.AreEqual("Waternet", waternet.Name);
             Assert.AreEqual(9.81, waternet.UnitWeight);
-            Assert.IsTrue(waternet.IsGenerated);
+            Assert.IsFalse(waternet.IsGenerated);
 
-            Assert.AreEqual(0, waternetCreator.LogMessages);
-            Assert.AreEqual(LanguageType.English, waternetCreator.Language);
+            Assert.AreEqual(Enumerable.Empty<LogMessage>(), waternetCreator.LogMessages);
+            Assert.AreEqual(LanguageType.Dutch, waternetCreator.Language);
         }
 
         private class TestWaternetKernelWrapper : WaternetKernelWrapper