Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r3279 -r3302
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 3279)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 3302)
@@ -36,7 +36,6 @@
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
     [TestFixture]
-    [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
     public class MacroStabilityInwardsTests
     {
         private const double Tolerance = 0.0005;
@@ -72,6 +71,7 @@
         /// <summary>Test for different segmentFailureMechanismType</summary>
         /// <param name="segmentFailureMechanismType">The soilprobabilities are set tot the specified segmentFailureMechanismType</param>
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)]
         [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)]
         public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType)
@@ -136,6 +136,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityTutorialDesignUpliftVan()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -190,6 +191,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -242,6 +244,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_BishopLowest()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -291,6 +294,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_NoUplift()
         {
             // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -342,6 +346,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1D()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -402,6 +407,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityDeltaDijkZoneAreasBishopWith1DZone2()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -489,17 +495,16 @@
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
 
             // one location is calculated with 3 1D profiles
-            Assert.AreEqual(3, output.Results.CalculationResults.Length);
+            // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has no result 
+            Assert.AreEqual(2, output.Results.CalculationResults.Length);
             Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[0].LocationName);
             Assert.AreEqual("6-4-1-A-1-F_1_s", output.Results.CalculationResults[0].ProfileName);
             Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[1].LocationName);
             Assert.AreEqual("6-4-1-A-1-F_2_s", output.Results.CalculationResults[1].ProfileName);
-            Assert.AreEqual("6-4-1-A-1-F", output.Results.CalculationResults[2].LocationName);
-            Assert.AreEqual("6-4-1-A-1-F_3_s", output.Results.CalculationResults[2].ProfileName);
 
             var result = output.Results.CalculationResults[0];
-            // SafetyFactor=1.032
-            Assert.AreEqual(1.032, result.StabilityDesignResults.SafetyFactor, Tolerance);
+            // SafetyFactor=1.575
+            Assert.AreEqual(1.575, result.StabilityDesignResults.SafetyFactor, Tolerance);
 
             // skip testing some of the results like uplift etc.
 
@@ -508,14 +513,13 @@
 
             // test safety factor for other profiles
             result = output.Results.CalculationResults[1];
-            // SafetyFactor=1.901
-            Assert.AreEqual(1.901, result.StabilityDesignResults.SafetyFactor, Tolerance);
-            result = output.Results.CalculationResults[2];
-            // SafetyFactor=1.670
-            Assert.AreEqual(1.670, result.StabilityDesignResults.SafetyFactor, Tolerance);
+            // SafetyFactor=1.449
+            Assert.AreEqual(1.449, result.StabilityDesignResults.SafetyFactor, Tolerance);
+            Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult));
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityInvoer10ForbiddenZoneBishop()
         {
             // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType.damx
@@ -632,6 +636,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunMacroStabilityWithErrorBishopUpliftVan()
         {
             // Expected results are determined by running .\data\DamEngineTestProjects\DeltaDijk_zonering_BI\DeltaDijk normal.damx
@@ -695,6 +700,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption()
         {
             // Inputfile was created with .\data\DamEngineTestProjects\Invoer2\DAM Tutorial Design\DAM Tutorial Design.damx
@@ -736,6 +742,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption()
         {
             // Inputfile was created with .\data\Dam\Benchmarks\Validatie SlopeAdaption\SlopeAdaption.damx
@@ -775,6 +782,7 @@
         }
 
         [Test, Category("Slow")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         // Expected results are determined by running .\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx
         // with Dam Classic rev.1059
         // Select 1st location (DWP_1)
@@ -832,6 +840,7 @@
 
         [Test]
         [SetUICulture("nl-NL")]
+        [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
         public void TestGiveFeedBackWhenNoProfilesAreAvailable()
         {
             // Based on "dam/IssueRelatedData/MWDAM-1341/HHNK Leggerstudie\DAM Leggerstudie.defx"