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));
         }