Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r2970 -r3000
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3000)
@@ -21,8 +21,8 @@
 
 using System;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
-using Deltares.DamEngine.TestHelpers;
 using Deltares.MacroStability.CSharpWrapper.Input;
 using Deltares.MacroStability.CSharpWrapper.Output;
 using KellermanSoftware.CompareNetObjects;
@@ -151,8 +151,10 @@
         #endregion
 
         #region Soil
-        [Test]
-        public void GivenMacroStabilitySoilWhenConvertingToDamSoilAndBackThenResultEqualsOriginal()
+        [TestCase(DilatancyType.MinusPhi)]
+        [TestCase(DilatancyType.Phi)]
+        [TestCase(DilatancyType.Zero)]
+        public void GivenMacroStabilitySoilWhenConvertingToDamSoilAndBackThenResultEqualsOriginal(DilatancyType dilatancyType)
         {
             // Given MacroStability Soil
             var macroStabilitySoil = new MacroStability.CSharpWrapper.Input.Soil()
@@ -162,16 +164,35 @@
                 BelowPhreaticLevel = 1.02,
                 Cohesion = 1.03,
                 FrictionAngle = 1.04,
-                Dilatancy = -1.04, // -Phi (FrictionAngle)
+                Dilatancy = 0,
                 RRatio = 1.05,
-                RatioCuPc  = 1.06,
+                RatioCuPc = 1.06,
                 //RheologicalCoefficient = 1.07, Not yet to be used
                 ShearStrengthModel = MacroStability.CSharpWrapper.Input.ShearStrengthModel.CPhiOrCuCalculated,
                 StrengthIncreaseExponent = 1.08,
                 UseSoilClassification = false, // must be false
                 BondStressCurve = null // must be null
             };
+            switch (dilatancyType)
+            {
+                case DilatancyType.MinusPhi:
+                {
+                    macroStabilitySoil.Dilatancy = macroStabilitySoil.FrictionAngle * -1;
+                    break;
+                }
+                case DilatancyType.Phi:
+                {
+                    macroStabilitySoil.Dilatancy = macroStabilitySoil.FrictionAngle;
+                    break;
+                }
+                case DilatancyType.Zero:
+                {
+                    macroStabilitySoil.Dilatancy = 0;
+                    break;
+                }
 
+            }
+
             // When Converting to DamSoil and back
             Soil damSoil = ConversionHelper.ConvertToDamSoil(macroStabilitySoil);
             var actualMacroStabilitySoil = ConversionHelper.ConvertToMacroStabilitySoil(damSoil);
@@ -181,6 +202,7 @@
             var result = compare.Compare(macroStabilitySoil, actualMacroStabilitySoil);
             Assert.AreEqual(0, result.Differences.Count, "Differences found converting/reconverting Soil but this ok now if diff = 3");
         }
+
         #endregion
 
         #region ShearStrengthModel