Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r3520 -r3624
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 3624)
@@ -222,6 +222,7 @@
             {
                 MStabParameters = new MStabParameters
                 {
+                    Model = MStabModelType.UpliftVan,
                     SearchMethod = MStabSearchMethod.Grid,
                     SlipCircleDefinition = new SlipCircleDefinition
                     {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r3621 -r3624
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3621)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3624)
@@ -113,8 +113,6 @@
             fillEngineFromMacroStabilityWrapperInput.FillDamProjectDataFromKernelModel(expectedMacrostabilityInput);
 
             // Then the data models are equal
-            Assert.AreEqual(expectedMacrostabilityInput.StabilityModel,
-                fillEngineFromMacroStabilityWrapperInput.FailureMechanismParametersMStab.MStabParameters.Model);
             CompareStabilityModel(expectedParametersMStab, fillEngineFromMacroStabilityWrapperInput.FailureMechanismParametersMStab);
             CompareSoilModel(expectedSoilList, fillEngineFromMacroStabilityWrapperInput.SoilList);
             CompareSoilProfile2D(expectedSoilProfile2D, fillEngineFromMacroStabilityWrapperInput.SoilProfile2D);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r3622 -r3624
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 3622)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 3624)
@@ -97,10 +97,7 @@
                         damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X);
                     var waterNet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, left, right);
                     
-                    FillMacroStabilityWrapperInputFromEngine fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
-                    {
-                        Model = FailureMechanismParametersMStab.MStabParameters.Model
-                    };
+                    var fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine();
 
                     switch (FailureMechanismParametersMStab.MStabParameters.Model)
                     {
@@ -163,11 +160,8 @@
                             UpliftVanGridCreator.DetermineTangentLines(upliftVanCalculationGrid, slipCircleDefinition, 
                                 soilProfile1DAtCenterOfLeftGridXCoordinate, minimumCircleDepth);
 
-                            fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
-                            {
-                                TrafficLoad = trafficLoad,
-                                UpliftVanCalculationGrid = upliftVanCalculationGrid
-                            };
+                            fillMacroStabilityWrapperFromEngine.TrafficLoad = trafficLoad;
+                            fillMacroStabilityWrapperFromEngine.UpliftVanCalculationGrid = upliftVanCalculationGrid;
                             break;
                         }
                         default:
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3622 -r3624
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3622)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3624)
@@ -295,7 +295,6 @@
             IKernelDataOutput kernelDataOutput = new MacroStabilityOutput();
             // Run the dll
             List<LogMessage> messages;
-            MacroStabilityKernelDataInput macroStabilityKernelDataInput = (MacroStabilityKernelDataInput)kernelDataInput;
             kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages);
             MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput;
             Assert.IsTrue(messages.Count > 0);
@@ -483,6 +482,7 @@
         }
 
         [Test]
+        [Ignore("Test disabled implementation of Bishop model in Engine. Investigate if the test is still usefull")]
         public void CalculationBishopBasedOnDamEngineXmlFailsForWrongType()
         {
             const string calcDir = "TestStabInwardsBishop";
@@ -503,7 +503,6 @@
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(3, output.Results.CalculationMessages.Length, "No results available");
-            // ToDo: Investigate if this test is still useful
         }
 
         [Test]
@@ -536,19 +535,17 @@
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionWhenInputIsNull()
         {
-            List<LogMessage> messages;
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.Execute(null, null, out messages); ;
+            kernelWrapper.Execute(null, null, out _);
         }
 
         [Test]
         [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Macro Stability")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionWhenStabilityInputIsNull()
         {
-            List<LogMessage> messages;
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.Execute(null, null, out messages); 
+            kernelWrapper.Execute(null, null, out _); 
         }
 
         [Test]
@@ -557,8 +554,7 @@
         public void TestThrowsExceptionWhenStabilityOutputIsNull()
         {
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            List<DesignResult> results;
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results);
+            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out _);
         }
 
         [Test]
@@ -567,8 +563,7 @@
         public void TestThrowsExceptionWhenDamKernelInputIsNull()
         {
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            List<DesignResult> results;
-            kernelWrapper.PostProcess(null, null, null, "", out results);
+            kernelWrapper.PostProcess(null, null, null, "", out _);
         }
 
         private static DamKernelInput CreateDamKernelInputForTest()
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r3622 -r3624
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3622)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 3624)
@@ -47,10 +47,7 @@
     {
         private readonly Dictionary<string, MacroStability.CSharpWrapper.Input.Soil> soilsDictionary = 
             new Dictionary<string, MacroStability.CSharpWrapper.Input.Soil>();
-
-        /// <summary>Gets or sets the model type.</summary>
-        /// <value>The model type.</value>
-        public MStabModelType Model { get; set; }
+        
         /// <summary>Gets or sets the UpliftVan calculation grid.</summary>
         /// <value>The uplift van calculation grid.</value>
         public UpliftVanCalculationGrid UpliftVanCalculationGrid { get; set; }
@@ -120,7 +117,7 @@
                         preprocessingSearchAreaConditions.AutoTangentLines);
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(Model));
+                    throw new ArgumentOutOfRangeException(nameof(failureMechanismParametersMStab.MStabParameters.Model));
             }
 
             lastStage.UniformLoads = new List<UniformLoad>();