Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4422 -r4446
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4422)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4446)
@@ -590,7 +590,7 @@
         File.WriteAllText("Results_Single_Core" + ".xml", outputString);
         Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
         Assert.AreEqual(18, output.Results.CalculationResults.Length);
-        Assert.AreEqual(3299, output.Results.CalculationMessages.Length);
+        Assert.AreEqual(3020, output.Results.CalculationMessages.Length);
         int resultsFound = 0;
         foreach (var designResult in output.Results.CalculationResults)
         {
@@ -615,9 +615,9 @@
                 Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(4)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
             {
-                Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
                 Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
@@ -629,9 +629,9 @@
                 Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(4)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
             {
-                Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
                 Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r4435 -r4446
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 4435)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 4446)
@@ -247,7 +247,7 @@
             damKernelInput.ProjectDir = projectPath;
             damKernelInput.CalculationDir = Path.Combine(projectPath, calculationMap);
             damKernelInput.Location = location;
-            damKernelInput.SubSoilScenario = soiProfileProbability;
+            damKernelInput.SubSoilScenario = soiProfileProbability.Copy();
             damKernelInput.DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification;
             damKernelInput.RiverLevelHigh = designScenario.RiverLevel;
             damKernelInput.RiverLevelLow = designScenario.RiverLevelLow;
@@ -380,6 +380,7 @@
         location.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder;
         location.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver;
         location.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside;
+        location.RiverLevel = designScenario.RiverLevel;
         if (designScenario.PlLineOffsetBelowDikeCrestMiddle.HasValue)
         {
             location.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r4439 -r4446
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4439)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4446)
@@ -461,7 +461,15 @@
         string result = engineInterface.Validate();
         Assert.IsTrue(result == null, "Validation must succeed but does not, see output xml in debugger");
         string outputString = engineInterface.Run();
-        File.WriteAllText("Results_Cores_" + maxCores + ".xml", outputString);
+        if (justOneScenario)
+        {
+            File.WriteAllText("Results_OneScenario_Cores_" + maxCores + ".xml", outputString);
+        }
+        else
+        {
+            File.WriteAllText("Results_Cores_" + maxCores + ".xml", outputString);    
+        }
+        
         Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
         if (justOneScenario)
         {
@@ -471,7 +479,7 @@
         else
         {
             Assert.AreEqual(18, output.Results.CalculationResults.Length);
-            Assert.AreEqual(3299, output.Results.CalculationMessages.Length);
+            Assert.AreEqual(3020, output.Results.CalculationMessages.Length);
         }
 
         int resultsFound = 0;
@@ -498,9 +506,9 @@
                 Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(4)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
             {
-                Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
                 Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
@@ -512,9 +520,9 @@
                 Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;
             }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(4)"))
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
             {
-                Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
                 Assert.AreEqual("4", designResult.ScenarioName);
                 Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
                 resultsFound++;