Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs	(revision 4462)
@@ -0,0 +1,390 @@
+// Copyright (C) Stichting Deltares 2023. All rights reserved.
+// 
+// This file is part of the Dam Engine.
+// 
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+// 
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//using NUnit.Framework;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.DamEngine.Calculators.DikesOperational;
+using Deltares.DamEngine.Data.General.TimeSeries;
+using Deltares.DamEngine.Io.XmlOutput;
+using NUnit.Framework;
+
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
+
+//[TestFixture]
+public static class CheckLargeResultsSets
+{
+    private const double tol2Digits = 0.005;
+    private const double tolerance = 0.0005;
+    //[Test]
+    public static void CheckResultsOperationalBeeSwarmMultiCoreWithXmlInputFile(List<Data.General.TimeSeries.TimeSerie> series)
+    {
+        var seriesCount = 0;
+        var resultsCount = 0;
+        const double cTolerance = 0.0005;
+        
+        foreach (Data.General.TimeSeries.TimeSerie timeSeries in series)
+        {
+            //Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId));
+            //Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId));
+            // StabilityInside check
+            if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
+            {
+                if (timeSeries.LocationId == "Purmer_PU0042+00_K")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.579, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+
+                if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.481, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+
+                if (timeSeries.LocationId == "Purmer_PU0042+00_R")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(1.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.355, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+                if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(1.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(1.272, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+                
+                if (timeSeries.LocationId == "Purmer_PU0110+20_K")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+                
+                if (timeSeries.LocationId == "Purmer_PU0110+20_K_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+                
+                if (timeSeries.LocationId == "Purmer_PU0110+20_R")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+
+                if (timeSeries.LocationId == "Purmer_PU0110+20_R_V")
+                {
+                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
+                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
+                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
+                }
+            }
+
+            seriesCount++;
+        }
+
+        Assert.IsTrue(seriesCount > 0, "No output time series");
+        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
+        
+    }
+
+    public static void CheckResultsDesignBishopWithScenariosForHeadPl3CalculatesCorrect(DesignResult[] calculationResults)
+    {
+        foreach (var designResult in calculationResults)
+        {
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)"))
+            {
+                Assert.AreEqual(9.300, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)"))
+            {
+                Assert.AreEqual(7.888, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)"))
+            {
+                Assert.AreEqual(7.023, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)"))
+            {
+                Assert.AreEqual(5.968, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)"))
+            {
+                Assert.AreEqual(7.555, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)"))
+            {
+                Assert.AreEqual(6.477, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)"))
+            {
+                Assert.AreEqual(7.353, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)"))
+            {
+                Assert.AreEqual(6.278, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.61, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)"))
+            {
+                Assert.AreEqual(5.945, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)"))
+            {
+                Assert.AreEqual(1.225, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)"))
+            {
+                Assert.AreEqual(1.608, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)"))
+            {
+                Assert.AreEqual(1.397, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)"))
+            {
+                Assert.AreEqual(4.557, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)"))
+            {
+                Assert.AreEqual(3.985, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)"))
+            {
+                Assert.AreEqual(4.087, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)"))
+            {
+                Assert.AreEqual(3.418, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)"))
+            {
+                Assert.AreEqual(4.432, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)"))
+            {
+                Assert.AreEqual(3.745, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
+            }
+        }
+    }
+
+    public static int CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(DesignResult[] calculationResults)
+    {
+        int resultsFound = 0;
+        foreach (var designResult in calculationResults)
+        {
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
+            {
+                Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
+            {
+                Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
+            {
+                Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                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(3)"))
+            {
+                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
+            {
+                Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                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(3)"))
+            {
+                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
+            {
+                Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
+            {
+                Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
+            {
+                Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
+            {
+                Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
+            {
+                Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
+            {
+                Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
+            {
+                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
+            {
+                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
+            {
+                Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)"))
+            {
+                Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
+            {
+                Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("3", designResult.ScenarioName);
+                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
+            {
+                Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance);
+                Assert.AreEqual("4", designResult.ScenarioName);
+                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
+                resultsFound++;
+            }
+        }
+        return resultsFound;
+    }
+}
\ No newline at end of file
Index: DamEngine/trunk/src/common/settings/General.DotSettings
===================================================================
diff -u -r4422 -r4462
--- DamEngine/trunk/src/common/settings/General.DotSettings	(.../General.DotSettings)	(revision 4422)
+++ DamEngine/trunk/src/common/settings/General.DotSettings	(.../General.DotSettings)	(revision 4462)
@@ -479,8 +479,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Phreatic/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=piezometric/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=polygonizer/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Prefilled/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Purmer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Prefilled/@EntryIndexedValue">True</s:Boolean>	
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=renderers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Riskeer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Schematization/@EntryIndexedValue">True</s:Boolean>
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs
===================================================================
diff -u -r4447 -r4462
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4447)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs	(.../MultiCoreMacroStabilityTests.cs)	(revision 4462)
@@ -24,16 +24,13 @@
 using System.Globalization;
 using System.IO;
 using System.Threading;
-using System.Linq;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 using TimeSerie = Deltares.DamEngine.Io.XmlOutput.TimeSerie;
-using Deltares.DamEngine.Calculators.DikesOperational;
-using Deltares.DamEngine.Data.General.TimeSeries;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests;
 
@@ -178,104 +175,9 @@
         
         int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
         Assert.AreEqual(0, errorCount, "There should be no errors during the calculation.");
-              
-        var seriesCount = 0;
-        var resultsCount = 0;
-        const double cTolerance = 0.0005;
-        
-        foreach (Deltares.DamEngine.Data.General.TimeSeries.TimeSerie timeSeries in series)
-        {
-            //Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId));
-            //Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId));
-            // StabilityInside check
-            if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
-            {
-                if (timeSeries.LocationId == "Purmer_PU0042+00_K")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.442, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.579, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
 
-                if (timeSeries.LocationId == "Purmer_PU0042+00_K_V")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.365, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.481, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
+        CheckLargeResultsSets.CheckResultsOperationalBeeSwarmMultiCoreWithXmlInputFile(series);
 
-                if (timeSeries.LocationId == "Purmer_PU0042+00_R")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.239, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.355, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
-                if (timeSeries.LocationId == "Purmer_PU0042+00_R_V")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(1.168, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(1.272, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
-                
-                if (timeSeries.LocationId == "Purmer_PU0110+20_K")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
-                
-                if (timeSeries.LocationId == "Purmer_PU0110+20_K_V")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
-                
-                if (timeSeries.LocationId == "Purmer_PU0110+20_R")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
-
-                if (timeSeries.LocationId == "Purmer_PU0110+20_R_V")
-                {
-                    TimeSerieEntry firstEntry = timeSeries.Entries.First();
-                    Assert.AreEqual(Double.NaN, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                    TimeSerieEntry lastEntry = timeSeries.Entries.Last();
-                    Assert.AreEqual(Double.NaN, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
-                    resultsCount++;
-                }
-            }
-
-            seriesCount++;
-        }
-
-        Assert.IsTrue(seriesCount > 0, "No output time series");
-        Assert.AreEqual(16, resultsCount, "Incorrect number of results");
-        
     }
     
     [Test, Category("MultiCore")]
@@ -311,117 +213,7 @@
         Assert.AreEqual(18, output.Results.CalculationResults.Length);
         Assert.AreEqual(24,output.Results.CalculationMessages.Length);
 
-        foreach (var designResult in output.Results.CalculationResults)
-        {
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)"))
-            {
-                Assert.AreEqual(9.300, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)"))
-            {
-                Assert.AreEqual(7.888, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)"))
-            {
-                Assert.AreEqual(7.023, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)"))
-            {
-                Assert.AreEqual(5.968, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)"))
-            {
-                Assert.AreEqual(7.555, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)"))
-            {
-                Assert.AreEqual(6.477, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)"))
-            {
-                Assert.AreEqual(7.353, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)"))
-            {
-                Assert.AreEqual(6.278, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.61, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)"))
-            {
-                Assert.AreEqual(5.945, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)"))
-            {
-                Assert.AreEqual(1.225, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)"))
-            {
-                Assert.AreEqual(1.608, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)"))
-            {
-                Assert.AreEqual(1.397, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)"))
-            {
-                Assert.AreEqual(4.557, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)"))
-            {
-                Assert.AreEqual(3.985, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)"))
-            {
-                Assert.AreEqual(4.087, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)"))
-            {
-                Assert.AreEqual(3.418, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)"))
-            {
-                Assert.AreEqual(4.432, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)"))
-            {
-                Assert.AreEqual(3.745, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);                    
-            }
-        }
+        CheckLargeResultsSets.CheckResultsDesignBishopWithScenariosForHeadPl3CalculatesCorrect(output.Results.CalculationResults);
     }
     
     [Test, Category("MultiCore")]
@@ -483,137 +275,8 @@
             Assert.AreEqual(3020, output.Results.CalculationMessages.Length);
         }
 
-        int resultsFound = 0;
-        foreach (var designResult in output.Results.CalculationResults)
-        {
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
-            {
-                Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
-            {
-                Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
-            {
-                Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                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(3)"))
-            {
-                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
-            {
-                Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                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(3)"))
-            {
-                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
-            {
-                Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
-            {
-                Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
-            {
-                Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
-            {
-                Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
-            {
-                Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
-            {
-                Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
-            {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
-            {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
-            {
-                Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)"))
-            {
-                Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
-            {
-                Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
-            {
-                Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-        }
-
+        int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
+            output.Results.CalculationResults);
         if (justOneScenario)
         {
             Assert.AreEqual(9, resultsFound);
Index: DamEngine/trunk/src/DamEngine.sln.DotSettings
===================================================================
diff -u -r3998 -r4462
--- DamEngine/trunk/src/DamEngine.sln.DotSettings	(.../DamEngine.sln.DotSettings)	(revision 3998)
+++ DamEngine/trunk/src/DamEngine.sln.DotSettings	(.../DamEngine.sln.DotSettings)	(revision 4462)
@@ -24,4 +24,5 @@
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=650CD2AC974D82428512CCF9373B1974/RelativePath/@EntryValue">..\common\settings\General.DotSettings</s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File650CD2AC974D82428512CCF9373B1974/@KeyIndexDefined">True</s:Boolean>
 	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File650CD2AC974D82428512CCF9373B1974/RelativePriority/@EntryValue">1</s:Double>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Purmer/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r4411 -r4462
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 4411)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 4462)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r4446 -r4462
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4446)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 4462)
@@ -71,7 +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")]
+    [Ignore("Test disabled due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation")]
     [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)]
     [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)]
     public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType)
@@ -135,7 +135,7 @@
     }
 
     [Test, Category("Slow")]
-    [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
+    [Ignore("Test disabled due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation")]
     public void TestRunMacroStabilityTutorialDesignUpliftVan()
     {
         // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -191,7 +191,7 @@
     }
 
     [Test, Category("Slow")]
-    [Ignore("Test disabled due to removal of the old MacroStability kernel wrapper implementation")]
+    [Ignore("Test disabled due to dependency on 2D geometries (sti files) and the old MacroStability kernel wrapper implementation")]
     public void TestRunMacroStabilityTutorialDesignBishopUpliftVan_UpliftVanLowest()
     {
         // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"
@@ -591,136 +591,8 @@
         Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
         Assert.AreEqual(18, output.Results.CalculationResults.Length);
         Assert.AreEqual(3020, output.Results.CalculationMessages.Length);
-        int resultsFound = 0;
-        foreach (var designResult in output.Results.CalculationResults)
-        {
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
-            {
-                Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)"))
-            {
-                Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)"))
-            {
-                Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                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(3)"))
-            {
-                Assert.AreEqual(4.335, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)"))
-            {
-                Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                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(3)"))
-            {
-                Assert.AreEqual(4.784, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
-            {
-                Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)"))
-            {
-                Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
-            {
-                Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)"))
-            {
-                Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
-            {
-                Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)"))
-            {
-                Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
-            {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)"))
-            {
-                Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)"))
-            {
-                Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)"))
-            {
-                Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
-            {
-                Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("3", designResult.ScenarioName);
-                Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-            if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)"))
-            {
-                Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance);
-                Assert.AreEqual("4", designResult.ScenarioName);
-                Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits);
-                resultsFound++;
-            }
-        }
+        int resultsFound = CheckLargeResultsSets.CheckResultsDesignBishopAdaptionWithScenariosForHeadPl3CalculatesCorrect(
+            output.Results.CalculationResults);
         Assert.AreEqual(18, resultsFound);
     }