Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r2193 -r2723
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 2193)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 2723)
@@ -109,9 +109,9 @@
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.AreEqual(122, output.Results.CalculationResults.Length);
+            Assert.AreEqual(112, output.Results.CalculationResults.Length);
             Assert.AreEqual(0.782, output.Results.CalculationResults[0].PipingDesignResults.BlighFactor, tolerance);
-            Assert.AreEqual(0.809, output.Results.CalculationResults[121].PipingDesignResults.BlighFactor, tolerance);
+            Assert.AreEqual(0.809, output.Results.CalculationResults[111].PipingDesignResults.BlighFactor, tolerance);
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs
===================================================================
diff -u -r2173 -r2723
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 2173)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 2723)
@@ -158,13 +158,13 @@
             kernelWrapper.Execute(damStabilityInput, kernelOutput, out messages);
             DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput)kernelOutput;
             Assert.AreEqual(0, messages.Count);
-            Assert.AreEqual(6.757, damMacroStabilityOutput.StabilityOutputItems[0].Zone1Results.SafetyFactor, cToleranceSafetyFactor);
+            Assert.AreEqual(6.752, damMacroStabilityOutput.StabilityOutputItems[0].Zone1Results.SafetyFactor, cToleranceSafetyFactor);
             Assert.IsNull(damMacroStabilityOutput.StabilityOutputItems[0].Zone2Results);
 
             // Fill the design results
             List<DesignResult> results;
             kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, null, "", out results);
-            Assert.AreEqual(6.757, results[0].StabilityDesignResults.SafetyFactor, cToleranceSafetyFactor);
+            Assert.AreEqual(6.752, results[0].StabilityDesignResults.SafetyFactor, cToleranceSafetyFactor);
             Assert.AreEqual("", results[0].StabilityDesignResults.ResultMessage);
             Assert.AreEqual(CalculationResult.Succeeded, results[0].CalculationResult);
             Assert.AreEqual("_Pro()", results[0].BaseFileName);
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r2193 -r2723
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2193)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2723)
@@ -188,16 +188,16 @@
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
 
             // The expected values below where calculated with DamEngine rev.2016,
-            Assert.AreEqual(122, output.Results.CalculationResults.Length);
+            Assert.AreEqual(112, output.Results.CalculationResults.Length);
             // result 1: safety factor = 90.000
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult));
             Assert.AreEqual(90.000, output.Results.CalculationResults[0].PipingDesignResults.Wti2017FactorOverall, tolerance);
             // result 2: safety factor = 58.243
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[2].CalculationResult));
             Assert.AreEqual(58.241, output.Results.CalculationResults[2].PipingDesignResults.Wti2017FactorOverall, tolerance);
             // result 3: safety factor = 0 NB. In 18.1.3 it was 90, but now we use Uplift calculation from WBI, before from DAM
-            Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[121].CalculationResult));
-            Assert.AreEqual(0.000, output.Results.CalculationResults[121].PipingDesignResults.Wti2017FactorOverall, tolerance);
+            Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[111].CalculationResult));
+            Assert.AreEqual(0.000, output.Results.CalculationResults[111].PipingDesignResults.Wti2017FactorOverall, tolerance);
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs
===================================================================
diff -u -r2193 -r2723
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs	(.../MacroStabilityOutwardsTests.cs)	(revision 2193)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs	(.../MacroStabilityOutwardsTests.cs)	(revision 2723)
@@ -76,50 +76,9 @@
 
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.IsNotNull(output.Results.CalculationResults, "No results available");
-            Assert.AreEqual(0.698, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance);
-            // Zone1SafetyFactor=1.282
-            Assert.AreEqual(0.698, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance);
-
-            // Zone1EntryPointX Local =38.818 Global=47.238
-            Assert.AreEqual(30.684, output.Results.CalculationResults[0].StabilityDesignResults.Zone1EntryPointX, tolerance);
-            // Zone1ExitPointX Local=64.262 Global=72.682
-            Assert.AreEqual(13.532, output.Results.CalculationResults[0].StabilityDesignResults.Zone1ExitPointX, tolerance);
-
-            // Zone2SafetyFactor null, is set to default reading from output.xml
-            Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2SafetyFactor, tolerance);
-            // Zone2EntryPointX null, is set to default reading from output.xml
-            Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2EntryPointX, tolerance);
-            // Zone2ExitPointX null, is set to default reading from output.xml
-            Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.Zone2ExitPointX, tolerance);
-
-            // NumberOfIterations=0
-            Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations);
-            // ResultMessage ""
-            Assert.AreEqual("", output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage);
-
-            // Check that a line is specified
-            Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine);
-
-            // Profile name = DWP_1.sti
-            Assert.AreEqual("DWP_1.sti", output.Results.CalculationResults[0].ProfileName);
-
-            // Uplift
-            var upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation;
-            Assert.IsNotNull(upliftSituation);
-            Assert.AreEqual(true, upliftSituation.IsUplift);
-            Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance);
-            Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance);
-            Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance);
-            Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance);
-            Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance);
-            Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance);
-
-            // Model Type
-            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, output.Results.CalculationResults[0].StabilityDesignResults.StabilityModelType);
-
-            // Calculation Result
-            Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult));
+            Assert.IsNull(output.Results.CalculationResults, "Results available when not expected");
+            Assert.AreEqual(1, output.Results.CalculationMessages.Length);
+            Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("should be higher than dike toe at river side"));            
         }
     }
 }