Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/OperationalSet2.xml
===================================================================
diff -u -r4000 -r4480
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/OperationalSet2.xml	(.../OperationalSet2.xml)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/OperationalSet2.xml	(.../OperationalSet2.xml)	(revision 4480)
@@ -21,7 +21,14 @@
                              Pl1BelowToeDikePolderside="0.1" DryPl1BelowDikeTopAtRiver="0.5"
                              DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1"
                              DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="output.Geometries"
                               SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\31ade595704e4403a5af4e4b152468de\output0.soilmaterials.mdb"
                               ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3"
@@ -46,7 +53,14 @@
                              Pl1BelowToeDikePolderside="0.1" DryPl1BelowDikeTopAtRiver="0.5"
                              DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1"
                              DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="output.Geometries"
                               SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\31ade595704e4403a5af4e4b152468de\output0.soilmaterials.mdb"
                               ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3"
@@ -71,7 +85,14 @@
                              Pl1BelowToeDikePolderside="0.1" DryPl1BelowDikeTopAtRiver="0.5"
                              DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1"
                              DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="output.Geometries"
                               SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\31ade595704e4403a5af4e4b152468de\output0.soilmaterials.mdb"
                               ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3"
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability.xml
===================================================================
diff -u -r4000 -r4480
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability.xml	(.../GrebbedijkStability.xml)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/GrebbedijkStability.xml	(.../GrebbedijkStability.xml)	(revision 4480)
@@ -19,7 +19,14 @@
                              Pl1BelowToeDikePolderside="0" DryPl1BelowDikeTopAtRiver="0"
                              DryPl1DryBelowDikeTopAtPolder="0" DryPl1BelowShoulderBaseInside="0"
                              DryPl1DryBelowDikeToeAtPolder="0" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
                               ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
@@ -43,7 +50,14 @@
                              Pl1BelowToeDikePolderside="0" DryPl1BelowDikeTopAtRiver="0"
                              DryPl1DryBelowDikeTopAtPolder="0" DryPl1BelowShoulderBaseInside="0"
                              DryPl1DryBelowDikeToeAtPolder="0" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
                               ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
@@ -67,7 +81,14 @@
                              Pl1BelowToeDikePolderside="0" DryPl1BelowDikeTopAtRiver="0"
                              DryPl1DryBelowDikeTopAtPolder="0" DryPl1BelowShoulderBaseInside="0"
                              DryPl1DryBelowDikeToeAtPolder="0" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
                               ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
@@ -91,7 +112,14 @@
                              Pl1BelowToeDikePolderside="0" DryPl1BelowDikeTopAtRiver="0"
                              DryPl1DryBelowDikeTopAtPolder="0" DryPl1BelowShoulderBaseInside="0"
                              DryPl1DryBelowDikeToeAtPolder="0" IntrusionVerticalWaterPressure="Standard"/>
-            <DesignScenarios/>
+            <DesignScenarios>
+                <DesignScenario Id="1" RiverLevel="100" RiverLevelLow="100" DikeTableHeight="102.5"
+                                PlLineOffsetBelowDikeTopAtRiver="0" PlLineOffsetBelowDikeTopAtPolder="0"
+                                PlLineOffsetBelowShoulderBaseInside="0" PlLineOffsetBelowDikeToeAtPolder="0"
+                                HeadPl3="100" HeadPl4="100" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2"
+                                RequiredSafetyFactorStabilityInnerSlope="1" RequiredSafetyFactorStabilityOuterSlope="1"
+                                RequiredSafetyFactorPiping="1"/>
+            </DesignScenarios>
             <StabilityOptions MapForSoilgeometries2D="Grebbedijk.geometries2D.0\"
                               SoilDatabaseName="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\damLiveWork\Grebbedijk0.soilmaterials.mdb"
                               ZoneType="1" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="0"
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r4474 -r4480
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 4474)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 4480)
@@ -86,6 +86,7 @@
     }
 
     [Test, Category(Categories.MultiCore)]
+    [Category(Categories.WorkInProgress)]
     // This test runs the same project as Run_UsingTestFiles_HasExpectedResultsInOutputFile
     // except that it runs it with both single core and multi core.
     // The output of both runs must be the same
@@ -121,11 +122,7 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"PulauTekong.geometries2D.0\");
         inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"PulauTekong0.soilmaterials.mdb");
         inputString = XmlAdapter.ChangeValueInXml(inputString, "MaxCalculationCores", coreCount.ToString());
-        var engineInterface = new EngineInterface(inputString);
-        Assert.IsNotNull(engineInterface.DamProjectData);
-        string outputString = engineInterface.Run();
-        File.WriteAllText(outputFileName, outputString, Encoding.Unicode);
-        Assert.IsNotNull(outputString);
-        return DamXmlSerialization.LoadOutputFromXmlString(outputString);
+
+        return GeneralHelper.RunAfterInputValidation(inputString);
     }
 }
\ No newline at end of file