Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs
===================================================================
diff -u -r3522 -r3620
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs	(.../KernelWrapperHelper.cs)	(revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs	(.../KernelWrapperHelper.cs)	(revision 3620)
@@ -54,13 +54,11 @@
                     switch (currentSpecification.StabilityModelType)
                     {
                         case MStabModelType.Bishop:
-                        case MStabModelType.BishopUpliftVan:
-                            // TODO: Hook this up with the new MacroStability kernel wrapper
-                            break;
                         case MStabModelType.UpliftVan:
+                        case MStabModelType.BishopUpliftVan:
                             kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-                            var wtiMacroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper)kernelWrapper;
-                            wtiMacroStabilityInwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy();
+                            var macroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper)kernelWrapper;
+                            macroStabilityInwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy();
                             break;
                         default:
                             throw new NotImplementedException();
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs
===================================================================
diff -u -r3522 -r3620
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 3620)
@@ -58,8 +58,7 @@
                 {
                     CalculationResult = ConversionHelper.ConvertToDamResultType(kernelOutput.ResultType),
                     SafetyFactor = kernelOutput.StabilityOutput.SafetyFactor,
-                    StabilityModelType =
-                        ConversionHelper.ConvertToMStabModelTypeFromOutput(kernelOutput.StabilityOutput.ModelOptionType)
+                    StabilityModelType = ConversionHelper.ConvertToMStabModelType(kernelOutput.StabilityOutput.ModelOptionType)
                 };
                 
                 if (outputItem.StabilityModelType == MStabModelType.Bishop)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r3617 -r3620
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3617)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3620)
@@ -71,22 +71,14 @@
 
         #region ModelType
         [Test]
-        //[TestCase(StabilityModelOption.Bishop, MStabModelType.BishopWti)]
+        [TestCase(StabilityModelOptionType.Bishop, MStabModelType.Bishop)]
         [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)]
         public void CanConvertToMStabModelType(StabilityModelOptionType modelOption, MStabModelType mStabModelType)
         {
             Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(modelOption));
         }
 
         [Test]
-        [TestCase(StabilityModelOptionType.Bishop, MStabModelType.BishopWti)]
-        [TestCase(StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan)]
-        public void CanConvertToMStabModelTypeFromOutput(StabilityModelOptionType modelOption, MStabModelType mStabModelType)
-        {
-            Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelTypeFromOutput(modelOption));
-        }
-
-        [Test]
         [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)]
         public void CanConvertToModelOptions(MStabModelType mStabModelType, StabilityModelOptionType modelOption)
         {
@@ -101,7 +93,6 @@
         }
 
         [ExpectedException(typeof(ArgumentException))]
-        [TestCase(MStabModelType.Bishop)]
         [TestCase(MStabModelType.UpliftSpencer)]
         [TestCase(MStabModelType.SpencerLow)]
         [TestCase(MStabModelType.SpencerHigh)]
@@ -225,18 +216,18 @@
         #endregion
 
         #region WaterpressureInterpolationModel
-        [TestCase(Data.Geotechnics.WaterpressureInterpolationModel.Automatic, WaterPressureInterpolationModel.Automatic)]
-        [TestCase(Data.Geotechnics.WaterpressureInterpolationModel.Hydrostatic, WaterPressureInterpolationModel.Hydrostatic)]
+        [TestCase(WaterpressureInterpolationModel.Automatic, WaterPressureInterpolationModel.Automatic)]
+        [TestCase(WaterpressureInterpolationModel.Hydrostatic, WaterPressureInterpolationModel.Hydrostatic)]
         public static void CanConvertToMacroStabilityWaterpressureInterpolationModel(
-            Data.Geotechnics.WaterpressureInterpolationModel damWaterpressureInterpolationModel, WaterPressureInterpolationModel waterpressureInterpolationModel)
+            WaterpressureInterpolationModel damWaterpressureInterpolationModel, WaterPressureInterpolationModel waterpressureInterpolationModel)
         {
             Assert.AreEqual(waterpressureInterpolationModel, ConversionHelper.ConvertToMacroStabilityWaterpressureInterpolationModel(damWaterpressureInterpolationModel));
         }
 
-        [TestCase(WaterPressureInterpolationModel.Automatic, Data.Geotechnics.WaterpressureInterpolationModel.Automatic)]
-        [TestCase(WaterPressureInterpolationModel.Hydrostatic, Data.Geotechnics.WaterpressureInterpolationModel.Hydrostatic)]
+        [TestCase(WaterPressureInterpolationModel.Automatic, WaterpressureInterpolationModel.Automatic)]
+        [TestCase(WaterPressureInterpolationModel.Hydrostatic, WaterpressureInterpolationModel.Hydrostatic)]
         public static void CanConvertToDamWaterpressureInterpolationModel(
-            WaterPressureInterpolationModel waterpressureInterpolationModel, Data.Geotechnics.WaterpressureInterpolationModel damWaterpressureInterpolationModel)
+            WaterPressureInterpolationModel waterpressureInterpolationModel, WaterpressureInterpolationModel damWaterpressureInterpolationModel)
         {
             Assert.AreEqual(damWaterpressureInterpolationModel, ConversionHelper.ConvertToDamWaterpressureInterpolationModel(waterpressureInterpolationModel));
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r3617 -r3620
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 3617)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 3620)
@@ -87,11 +87,10 @@
         /// <returns>the Dam MStabModelType</returns>
         public static MStabModelType ConvertToMStabModelType(StabilityModelOptionType modelOption)
         {
-            // For the macrostability kernel, the only really supported option for now is UpliftVan. But the other two could be options in future version
-            var translationTable = new Dictionary<StabilityModelOptionType, MStabModelType>()
+            var translationTable = new Dictionary<StabilityModelOptionType, MStabModelType>
             {
-                //{StabilityModelOptionOutput.Bishop, MStabModelType.BishopWti},
-                {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan },
+                {StabilityModelOptionType.Bishop, MStabModelType.Bishop},
+                {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan},
                 //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti}
             };
             return translationTable[modelOption];
@@ -103,44 +102,29 @@
         /// <exception cref="System.ArgumentException"></exception>
         public static StabilityModelOptionType ConvertToModelOptions(MStabModelType mStabModelType)
         {
-            // For the macrostability kernel, the only supported option for now is UpliftVan.
-            if (mStabModelType != MStabModelType.UpliftVan)
+            // For the MacroStability kernel, the only supported option for now is UpliftVan.
+            if (mStabModelType != MStabModelType.UpliftVan && mStabModelType != MStabModelType.Bishop)
             {
-                throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType));
+                throw new ArgumentException(string.Format("Unsupported MStabModelType: {0}", mStabModelType));
             }
             var translationTable = new Dictionary<MStabModelType, StabilityModelOptionType>()
             {
-                {MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan}
+                {MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan},
+                {MStabModelType.Bishop, StabilityModelOptionType.Bishop}
             };
             return translationTable[mStabModelType];
         }
 
-        /// <summary>Converts ModelOption to the MStabModelType.</summary>
-        /// This comes back from the kernel side so any model that can be matched is OK.
-        /// <param name="modelOption">The model option.</param>
-        /// <returns>the Dam MStabModelType</returns>
-        public static MStabModelType ConvertToMStabModelTypeFromOutput(StabilityModelOptionType modelOption)
-        {
-            // For the macrostability kernel, the only really supported option for now is UpliftVan. But the other two could be options in future version
-            var translationTable = new Dictionary<StabilityModelOptionType, MStabModelType>()
-            {
-                {StabilityModelOptionType.Bishop, MStabModelType.BishopWti},
-                {StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan },
-                //{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti}
-            };
-            return translationTable[modelOption];
-        }
-
         /// <summary>Converts to ModelOptions type.</summary>
         /// <param name="mStabModelType">the MStabModelType.</param>
         /// <returns>the MacroStability ModelOption</returns>
         /// <exception cref="System.ArgumentException"></exception>
         public static StabilityModelOptionType ConvertToModelOptionsOutput(MStabModelType mStabModelType)
         {
-            // For the macrostability kernel, the only supported option for now is UpliftVan.
+            // For the MacroStability kernel, the only supported option for now is UpliftVan.
             if (mStabModelType != MStabModelType.UpliftVan)
             {
-                throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType));
+                throw new ArgumentException(string.Format("Unsupported MStabModelType: {0}", mStabModelType));
             }
             var translationTable = new Dictionary<MStabModelType, StabilityModelOptionType>()
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/UpliftVanCalculationGrid.cs
===================================================================
diff -u -r3522 -r3620
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/UpliftVanCalculationGrid.cs	(.../UpliftVanCalculationGrid.cs)	(revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/UpliftVanCalculationGrid.cs	(.../UpliftVanCalculationGrid.cs)	(revision 3620)
@@ -23,7 +23,7 @@
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon
 {
-    /// <summary>Parameters for the UpliftVan Macrostability kernel; used for IO</summary>
+    /// <summary>Parameters for the UpliftVan MacroStability kernel; used for IO</summary>
     public class UpliftVanCalculationGrid
     {
         /// <summary>Gets or sets the IsGridsAutomatic option.</summary>
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r3520 -r3620
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3620)
@@ -79,7 +79,7 @@
                 dikeLocation.Scenarios.Add(scenario);
             }
             string result = engineInterface.Validate();
-            Assert.IsTrue(result == null, "Validation must succeed but does not, see validation output xml in debugger");
+            Assert.IsNull(result, "Validation must succeed but does not, see validation output xml in debugger");
             string outputString = engineInterface.Run();
             File.WriteAllText(outputFileName, outputString, Encoding.Unicode);
             Assert.IsNotNull(outputString);