Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r3000 -r3025
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3025)
@@ -168,7 +168,7 @@
                 RRatio = 1.05,
                 RatioCuPc = 1.06,
                 //RheologicalCoefficient = 1.07, Not yet to be used
-                ShearStrengthModel = MacroStability.CSharpWrapper.Input.ShearStrengthModel.CPhiOrCuCalculated,
+                ShearStrengthModel = MacroStability.CSharpWrapper.ShearStrengthModelType.CPhiOrCuCalculated,
                 StrengthIncreaseExponent = 1.08,
                 UseSoilClassification = false, // must be false
                 BondStressCurve = null // must be null
@@ -206,20 +206,20 @@
         #endregion
 
         #region ShearStrengthModel
-        [TestCase(MacroStability.CSharpWrapper.Input.ShearStrengthModel.CPhi, ShearStrengthModel.CPhi)]
-        [TestCase(MacroStability.CSharpWrapper.Input.ShearStrengthModel.CPhiOrCuCalculated, ShearStrengthModel.CPhiOrSuCalculated)]
-        [TestCase(MacroStability.CSharpWrapper.Input.ShearStrengthModel.CuCalculated, ShearStrengthModel.SuCalculated)]
+        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.CPhi, ShearStrengthModel.CPhi)]
+        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.CPhiOrCuCalculated, ShearStrengthModel.CPhiOrSuCalculated)]
+        [TestCase(MacroStability.CSharpWrapper.ShearStrengthModelType.CuCalculated, ShearStrengthModel.SuCalculated)]
         public static void CanConvertToDamShearStrengthModel(
-            MacroStability.CSharpWrapper.Input.ShearStrengthModel kernelShearStrengthModel, ShearStrengthModel damShearStrengthModel)
+            MacroStability.CSharpWrapper.ShearStrengthModelType kernelShearStrengthModel, ShearStrengthModel damShearStrengthModel)
         {
             Assert.AreEqual(damShearStrengthModel, ConversionHelper.ConvertToDamShearStrengthModel(kernelShearStrengthModel));
         }
 
-        [TestCase(ShearStrengthModel.CPhi, MacroStability.CSharpWrapper.Input.ShearStrengthModel.CPhi)]
-        [TestCase(ShearStrengthModel.CPhiOrSuCalculated, MacroStability.CSharpWrapper.Input.ShearStrengthModel.CPhiOrCuCalculated)]
-        [TestCase(ShearStrengthModel.SuCalculated, MacroStability.CSharpWrapper.Input.ShearStrengthModel.CuCalculated)]
+        [TestCase(ShearStrengthModel.CPhi, MacroStability.CSharpWrapper.ShearStrengthModelType.CPhi)]
+        [TestCase(ShearStrengthModel.CPhiOrSuCalculated, MacroStability.CSharpWrapper.ShearStrengthModelType.CPhiOrCuCalculated)]
+        [TestCase(ShearStrengthModel.SuCalculated, MacroStability.CSharpWrapper.ShearStrengthModelType.CuCalculated)]
         public static void CanConvertToMacroStabilityShearStrengthModel(
-            ShearStrengthModel damShearStrengthModel, MacroStability.CSharpWrapper.Input.ShearStrengthModel kernelShearStrengthModel)
+            ShearStrengthModel damShearStrengthModel, MacroStability.CSharpWrapper.ShearStrengthModelType kernelShearStrengthModel)
         {
             Assert.AreEqual(kernelShearStrengthModel, ConversionHelper.ConvertToMacroStabilityShearStrengthModel(damShearStrengthModel));
         }