Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r2032 -r2038
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2038)
@@ -23,10 +23,12 @@
 using System.Collections.Generic;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.Data.Standard;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
+using Deltares.MacroStability.Standard;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
+using LogMessageType = Deltares.DamEngine.Data.Standard.Logging.LogMessageType;
+using ObjectExtensions = Deltares.DamEngine.Data.Standard.ObjectExtensions;
 using ShearStrengthModel = Deltares.DamEngine.Data.Geotechnics.ShearStrengthModel;
 using Soil = Deltares.MacroStability.Geometry.Soil;
 using WaterpressureInterpolationModel = Deltares.MacroStability.Geometry.WaterpressureInterpolationModel;
@@ -210,15 +212,15 @@
                 //UsePop = true,
                 //WhitesConstant = 0.00,
             };
-            if (soil.Dilatancy.AlmostEquals(soil.FrictionAngle, tolerance))
+            if (ObjectExtensions.AlmostEquals(soil.Dilatancy, soil.FrictionAngle, tolerance))
             {
                 damSoil.DilatancyType = DilatancyType.Phi;
             }
-            else if (soil.Dilatancy.AlmostEquals(-soil.FrictionAngle, tolerance))
+            else if (ObjectExtensions.AlmostEquals(soil.Dilatancy, -soil.FrictionAngle, tolerance))
             {
                 damSoil.DilatancyType = DilatancyType.MinusPhi;
             }
-            else if (soil.Dilatancy.AlmostEquals(0.0, tolerance))
+            else if (ObjectExtensions.AlmostEquals(soil.Dilatancy, 0.0, tolerance))
             {
                 damSoil.DilatancyType = DilatancyType.Zero;
             }
@@ -362,5 +364,40 @@
             return translationTable[damCharacteristicPointType];
         }
         #endregion
+
+        #region LogMessages
+        /// <summary>
+        /// Converts the kernel validation result type to log message type of DamEngine.
+        /// </summary>
+        /// <param name="messageType">Type of the message.</param>
+        /// <returns></returns>
+        public static LogMessageType ConvertKernelValidationResultTypeToLogMessageType(ValidationResultType messageType)
+        {
+            var translationTable = new Dictionary<ValidationResultType, LogMessageType>()
+            {
+                {ValidationResultType.Info, LogMessageType.Info},
+                {ValidationResultType.Warning, LogMessageType.Warning},
+                {ValidationResultType.Error, LogMessageType.Error}
+            };
+            return translationTable[messageType];
+        }
+
+        /// <summary>
+        /// Converts the kernel log message type to log message type of DamEngine.
+        /// </summary>
+        /// <param name="messageType">Type of the message.</param>
+        /// <returns></returns>
+        public static LogMessageType ConvertKernelLogMessageTypeToLogMessageType(MacroStability.Standard.LogMessageType messageType)
+        {
+            var translationTable = new Dictionary<MacroStability.Standard.LogMessageType, LogMessageType>()
+            {
+                {MacroStability.Standard.LogMessageType.Info, LogMessageType.Info},
+                {MacroStability.Standard.LogMessageType.Warning, LogMessageType.Warning},
+                {MacroStability.Standard.LogMessageType.Error, LogMessageType.Error}
+            };
+            return translationTable[messageType];
+        }
+        #endregion
+
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r2033 -r2038
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 2033)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 2038)
@@ -33,8 +33,6 @@
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.TestHelpers.Factories;
-using Deltares.MacroStability.Geometry;
-using Deltares.MacroStability.Standard;
 using NUnit.Framework;
 using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage;
 using LogMessageType = Deltares.DamEngine.Data.Standard.Logging.LogMessageType;
@@ -152,15 +150,6 @@
             kernelWrapper.ParseValidationResult(xmlValidationResult, out messages);
         }
 
-        [TestCase(ValidationResultType.Info, LogMessageType.Info)]
-        [TestCase(ValidationResultType.Warning, LogMessageType.Warning)]
-        [TestCase(ValidationResultType.Error, LogMessageType.Error)]
-        public void TestConvertKernelValidationResultTypeToLogMessageType(ValidationResultType validationResultType, LogMessageType logMessageType)
-        {
-            Assert.AreEqual(logMessageType, 
-                MacroStabilityInwardsKernelWrapper.ConvertKernelValidationResultTypeToLogMessageType(validationResultType));
-        }
-
         [Test]
         // Result1True.xml is generated with BmMacrostabiliteit 'Benchmark 1-01b.wti'
         // Result2True.xml is generated with BmMacrostabiliteit 'Benchmark 4-01b.wti'
@@ -208,16 +197,6 @@
             Assert.AreEqual(double.NaN, macroStabilityOutputItem.SafetyFactor, diff);
         }
 
-        [TestCase(MacroStability.Standard.LogMessageType.Info, LogMessageType.Info)]
-        [TestCase(MacroStability.Standard.LogMessageType.Warning, LogMessageType.Warning)]
-        [TestCase(MacroStability.Standard.LogMessageType.Error, LogMessageType.Error)]
-        public void TestConvertKernelLogMessageTypeToLogMessageType(MacroStability.Standard.LogMessageType kernelLogMessageType, 
-            LogMessageType logMessageType)
-        {
-            Assert.AreEqual(logMessageType,
-                MacroStabilityInwardsKernelWrapper.ConvertKernelLogMessageTypeToLogMessageType(kernelLogMessageType));
-        }
-
         [Test]
         public void TestPostProcess()
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r2032 -r2038
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2038)
@@ -25,9 +25,11 @@
 using Deltares.DamEngine.TestHelpers;
 using Deltares.MacroStability.Data;
 using Deltares.MacroStability.Geometry;
+using Deltares.MacroStability.Standard;
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
+using LogMessageType = Deltares.DamEngine.Data.Standard.Logging.LogMessageType;
 using ShearStrengthModel = Deltares.DamEngine.Data.Geotechnics.ShearStrengthModel;
 using Soil = Deltares.DamEngine.Data.Geotechnics.Soil;
 
@@ -249,5 +251,26 @@
         }
         #endregion
 
+        #region LogMessages
+        [TestCase(ValidationResultType.Info, Data.Standard.Logging.LogMessageType.Info)]
+        [TestCase(ValidationResultType.Warning, Data.Standard.Logging.LogMessageType.Warning)]
+        [TestCase(ValidationResultType.Error, Data.Standard.Logging.LogMessageType.Error)]
+        public void TestConvertKernelValidationResultTypeToLogMessageType(ValidationResultType validationResultType, LogMessageType logMessageType)
+        {
+            Assert.AreEqual(logMessageType,
+                ConversionHelper.ConvertKernelValidationResultTypeToLogMessageType(validationResultType));
+        }
+
+        [TestCase(MacroStability.Standard.LogMessageType.Info, LogMessageType.Info)]
+        [TestCase(MacroStability.Standard.LogMessageType.Warning, LogMessageType.Warning)]
+        [TestCase(MacroStability.Standard.LogMessageType.Error, LogMessageType.Error)]
+        public void TestConvertKernelLogMessageTypeToLogMessageType(MacroStability.Standard.LogMessageType kernelLogMessageType,
+            LogMessageType logMessageType)
+        {
+            Assert.AreEqual(logMessageType,
+                ConversionHelper.ConvertKernelLogMessageTypeToLogMessageType(kernelLogMessageType));
+        }
+        #endregion
+
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r2032 -r2038
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2038)
@@ -34,8 +34,6 @@
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
-using Deltares.MacroStability.Geometry;
-using Deltares.MacroStability.Standard;
 using Deltares.WTIStability.Calculation.Wrapper;
 using GeometryPoint = Deltares.DamEngine.Data.Geometry.GeometryPoint;
 using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage;
@@ -179,22 +177,11 @@
                 messages.Add(new LogMessage
                 {
                     Message = result.Text,
-                    MessageType = ConvertKernelValidationResultTypeToLogMessageType(result.MessageType)
+                    MessageType = ConversionHelper.ConvertKernelValidationResultTypeToLogMessageType(result.MessageType)
                 });
             }
         }
 
-        internal static LogMessageType ConvertKernelValidationResultTypeToLogMessageType(ValidationResultType messageType)
-        {
-            var translationTable = new Dictionary<ValidationResultType, LogMessageType>()
-            {
-                {ValidationResultType.Info, LogMessageType.Info},
-                {ValidationResultType.Warning, LogMessageType.Warning},
-                {ValidationResultType.Error, LogMessageType.Error}
-            };
-            return translationTable[messageType];
-        }
-
         /// <summary>
         /// Executes the kernel.
         /// </summary>
@@ -281,22 +268,11 @@
                 messages.Add(new LogMessage
                 {
                     Message = message.Message,
-                    MessageType = ConvertKernelLogMessageTypeToLogMessageType(message.MessageType)
+                    MessageType = ConversionHelper.ConvertKernelLogMessageTypeToLogMessageType(message.MessageType)
                 });
             }
         }
 
-        internal static LogMessageType ConvertKernelLogMessageTypeToLogMessageType(MacroStability.Standard.LogMessageType messageType)
-        {
-            var translationTable = new Dictionary<MacroStability.Standard.LogMessageType, LogMessageType>()
-            {
-                {MacroStability.Standard.LogMessageType.Info, LogMessageType.Info},
-                {MacroStability.Standard.LogMessageType.Warning, LogMessageType.Warning},
-                {MacroStability.Standard.LogMessageType.Error, LogMessageType.Error}
-            };
-            return translationTable[messageType];
-        }
-
         /// <summary>
         /// Creates the calculator for stability based on kernel input.
         /// </summary>