Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 4227)
@@ -57,7 +57,7 @@
                     UpliftCriterionPiping = 1.0
                 }
             };
-
+            location.Scenarios.Add(new DesignScenario());
             var designScenario = new DesignScenario
             {
                 LocationScenarioID = "1", 
@@ -134,7 +134,7 @@
                     UpliftCriterionPiping = 1.0
                 }
             };
-
+            location.Scenarios.Add(new DesignScenario());
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs	(.../UpliftHelperTests.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs	(.../UpliftHelperTests.cs)	(revision 4227)
@@ -22,6 +22,7 @@
 using System.IO;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
 using Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamMacroStabilityCommon;
+using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.TestHelpers.Factories;
@@ -79,6 +80,7 @@
             var soilDbName = Path.Combine(projectPath, "soilMaterials.mdb");
 
             var location = DamMacroStabilityTestHelper.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1());
+            location.Scenarios.Add(new DesignScenario());
             location.StabilityOptions = new StabilityOptions();
             location.StabilityOptions.TrafficLoad = 10.0;
             location.StabilityOptions.SoilGeometries2DPath = projectPath;
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs	(.../DamMacroStabilityTestHelper.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityTestHelper.cs	(.../DamMacroStabilityTestHelper.cs)	(revision 4227)
@@ -41,6 +41,7 @@
                 Location = location,
                 LocationScenarioID = "ScenarioID"
             };
+            location.CurrentScenario = scenario;
             return scenario;
         }
         /// <summary>
@@ -51,6 +52,7 @@
         public static Location CreateLocation(SurfaceLine2 surfaceLine)
         {
             Location location = new Location();
+            location.Scenarios.Add(new DesignScenario());
             location.Name = "LocationName";
             location.DikeEmbankmentMaterial = "OB1";
             location.ShoulderEmbankmentMaterial = "OB2";
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 4227)
@@ -76,7 +76,7 @@
                     UpliftCriterionPiping = 1.0
                 }
             };
-
+            location.Scenarios.Add(new DesignScenario());
             var designScenario = new DesignScenario
             {
                 LocationScenarioID = "1",
@@ -161,7 +161,7 @@
                     UpliftCriterionPiping = 1.0
                 }
             };
-
+            location.Scenarios.Add(new DesignScenario());
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.SoilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithTwoSandlayers();
             subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Piping;
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs	(.../PlLinesHelperTests.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs	(.../PlLinesHelperTests.cs)	(revision 4227)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
+using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.PlLines;
 using Deltares.DamEngine.Data.Geotechnics;
@@ -37,6 +38,7 @@
             // expected values retrieved from debugging Dam Classic (rev.663) 
             // test CanCalculateThePipingFactorUsingSellmeijer4Forces
             var location = new Location();
+            location.Scenarios.Add(new DesignScenario());     
             location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             var riverLevel = 1.0;
@@ -67,6 +69,7 @@
 
             // Same as TestCreatePlLinesNoHydraulicShortcut because HeadInPlLine3 is not given.
             var location = new Location();
+            location.Scenarios.Add(new DesignScenario());
             location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             var riverLevel = 1.0;
@@ -100,12 +103,13 @@
             // in between aquifer so Head (1.0) is used instead of riverlevel.
             // PL2 and PL4 now generated at riverlevel.
             var location = new Location();
+            location.Scenarios.Add(new DesignScenario());
             location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
             AddLayerToSoilProfile(soilProfile1D, -4, false);
             AddLayerToSoilProfile(soilProfile1D, -5, true);
             var riverLevel = 0.5;
-            location.HeadPl3 = 1.0;
+            location.Scenarios[0].HeadPl3 = 1.0;
             UpliftSituation upliftSituation;
             var plLines = PlLinesHelper.CreatePlLinesForPiping(location, soilProfile1D, riverLevel, out upliftSituation);
             Assert.AreEqual(4, plLines.PlLineCount);
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 4227)
@@ -93,6 +93,7 @@
             Directory.CreateDirectory(workingDir);
 
             var location = DamMacroStabilityTestHelper.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1());
+            location.Scenarios.Add(new DesignScenario());
             location.StabilityOptions = new StabilityOptions();
             location.StabilityOptions.TrafficLoad = 10.0;
             location.StabilityOptions.SoilGeometries2DPath = geometryPath;
Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r3737 -r4227
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 3737)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 4227)
@@ -57,7 +57,7 @@
                     UpliftCriterionPiping = 1.0
                 }
             };
-
+            location.Scenarios.Add(new DesignScenario());
             var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification()
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
@@ -128,6 +128,7 @@
 
 
             var location = new Location();
+            location.Scenarios.Add(new DesignScenario());
             location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             location.ModelFactors.UpliftCriterionPiping = 1.0;