Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong_inside/Input.xml
===================================================================
diff -u -r5675 -r5829
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong_inside/Input.xml	(.../Input.xml)	(revision 5675)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong_inside/Input.xml	(.../Input.xml)	(revision 5829)
@@ -1432,7 +1432,7 @@
       <PreconsolidationStresses />
     </SoilProfile2D>
   </SoilProfiles2D>
-  <StabilityParameters SearchMethod="0" GridDetermination="1" BishopTangentLinesDefinition="1" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridLeftVerticalPointsCount="10" UpliftVanGridLeftVerticalPointsDistance="2.5" UpliftVanGridLeftHorizontalPointsCount="10" UpliftVanGridLeftHorizontalPointsDistance="2.5" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2.5" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2.5" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="0" BishopSearchAreaDetermination="1" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridDetermination="1" UpliftVanGridLeftVerticalPointsCount="10" UpliftVanGridLeftVerticalPointsDistance="2.5" UpliftVanGridLeftHorizontalPointsCount="10" UpliftVanGridLeftHorizontalPointsDistance="2.5" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2.5" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2.5" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
   <AquiferSoils xsi:nil="true" />
   <TrafficLoadDegreeOfConsolidations>
     <TrafficLoadDegreeOfConsolidation SoilName="CB" DegreeOfConsolidation="100" />
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r5727 -r5829
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 5727)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 5829)
@@ -32,7 +32,6 @@
     private const double tolerance = 0.00051;
 
     [Test]
-    [Category(Categories.WorkInProgress)]
     public void Run2DStabilityInside_UsingTestFile_HasExpectedResultsInOutputFile()
     {
         const string calcDir = "TestOperationalPulauTekongInside";
@@ -54,16 +53,15 @@
         Assert.Multiple(() =>
         {
             Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.518).Within(tolerance));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.408).Within(tolerance));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.274).Within(tolerance));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.034).Within(tolerance));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.135).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.439).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.218).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.375).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.395).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.997).Within(tolerance));
         });
     }
 
     [Test]
-    [Category(Categories.WorkInProgress)]
     public void Run2DStabilityOutside_UsingTestFile_HasExpectedResultsInOutputFile()
     {
         const string calcDir = "TestOperationalPulauTekongOutside";
@@ -85,9 +83,9 @@
         Assert.Multiple(() =>
         {
             Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.939).Within(tolerance));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.235).Within(tolerance));
-            // Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.279).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.222).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.231).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(1.282).Within(tolerance));
         });
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/HHNKPurmer/Input.xml
===================================================================
diff -u -r5693 -r5829
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/HHNKPurmer/Input.xml	(.../Input.xml)	(revision 5693)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/HHNKPurmer/Input.xml	(.../Input.xml)	(revision 5829)
@@ -1236,7 +1236,7 @@
       <PreconsolidationStresses />
     </SoilProfile2D>
   </SoilProfiles2D>
-  <StabilityParameters SearchMethod="0" GridDetermination="1" BishopTangentLinesDefinition="0" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridLeftVerticalPointsCount="10" UpliftVanGridLeftVerticalPointsDistance="2.5" UpliftVanGridLeftHorizontalPointsCount="10" UpliftVanGridLeftHorizontalPointsDistance="2.5" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2.5" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2.5" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="0" BishopSearchAreaDetermination="1" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridDetermination="1" UpliftVanGridLeftVerticalPointsCount="10" UpliftVanGridLeftVerticalPointsDistance="2.5" UpliftVanGridLeftHorizontalPointsCount="10" UpliftVanGridLeftHorizontalPointsDistance="2.5" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2.5" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2.5" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
   <AquiferSoils xsi:nil="true" />
   <TrafficLoadDegreeOfConsolidations>
     <TrafficLoadDegreeOfConsolidation SoilName="Hollandveen_n_dijk" DegreeOfConsolidation="0" />
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs
===================================================================
diff -u -r5727 -r5829
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs	(.../OperationalHHNKTests.cs)	(revision 5727)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalHHNKTests.cs	(.../OperationalHHNKTests.cs)	(revision 5829)
@@ -36,7 +36,6 @@
     private const double tolerance = 0.00051;
 
     [Test]
-    [Category(Categories.WorkInProgress)]
     public void Run2DStabilityInside_UsingTestFile_HasExpectedResultsInOutputFile()
     {
         const string calcDir = "TestOperationalHHNKPurmer";
@@ -52,31 +51,21 @@
         inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
         inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
 
-        // var engineInterface = new EngineInterface(inputString);
-        // var soilProfile2D = engineInterface.DamProjectData.Dike.Locations[0].Segment.SoilProfileProbabilities[0].SoilProfile2D;
-        // GeometryData geometry = soilProfile2D.Geometry;
-        // SurfaceLine2 surfaceLine = engineInterface.DamProjectData.Dike.Locations[0].SurfaceLine;
-        // //GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + "BeforeGeometry.txt");
-        // //GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + 
-        // //                                                  GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry);
-        // string soilName = engineInterface.DamProjectData.Dike.Locations[0].DikeEmbankmentMaterial;  
-        // Soil soil = engineInterface.DamProjectData.Dike.SoilList.GetSoilByName(soilName);
-        // // To be able to check the geometry, create it here.
-        // SoilProfile2D soilProfile2DNew = SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D(surfaceLine.Geometry, soilProfile2D, soil, 0.0);
-        
-        //GeometryExporter.ExportToFile(soilProfile2DNew.Geometry, GeometryExporter.VisualizationFolder + "AfterGeometry.txt");
-        //GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + 
-        //                                                 GeometryExporter.ExportJasonFile, soilProfile2DNew.Geometry, null);
+        Output output = GeneralHelper.RunAfterInputValidation(inputString, false, "Output.xml");
 
-        Output output = GeneralHelper.RunAfterInputValidation(inputString);
-//        Output output = GeneralHelper.RunAfterInputValidation(inputString, false, "Output.xml");
-
         Assert.That(output.Results.OperationalOutputTimeSeries, Has.Length.EqualTo(8));
         Assert.Multiple(() =>
         {
             Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry, Has.Length.EqualTo(1));
-//            Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.8555).Within(tolerance));
-//            Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.7421).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.932).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.862).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.803).Within(tolerance));
+            Assert.That(output.Results.OperationalOutputTimeSeries[3].Entries.TimeSerieEntry[0].Value, Is.EqualTo(0.747).Within(tolerance));
+            // The following values are NaN due to no uplift
+            Assert.That(output.Results.OperationalOutputTimeSeries[4].Entries.TimeSerieEntry[0].Value, Is.NaN);
+            Assert.That(output.Results.OperationalOutputTimeSeries[5].Entries.TimeSerieEntry[0].Value, Is.NaN);
+            Assert.That(output.Results.OperationalOutputTimeSeries[6].Entries.TimeSerieEntry[0].Value, Is.NaN);
+            Assert.That(output.Results.OperationalOutputTimeSeries[7].Entries.TimeSerieEntry[0].Value, Is.NaN);
         });
     }
 }
\ No newline at end of file