Index: DamClients/DamLive/trunk/data/HHNK Purmer/live.OutputTimeSeries.xml
===================================================================
diff -u -r5381 -r5828
--- DamClients/DamLive/trunk/data/HHNK Purmer/live.OutputTimeSeries.xml	(.../live.OutputTimeSeries.xml)	(revision 5381)
+++ DamClients/DamLive/trunk/data/HHNK Purmer/live.OutputTimeSeries.xml	(.../live.OutputTimeSeries.xml)	(revision 5828)
@@ -13,7 +13,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.8555" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="0.9318925074429016" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -28,7 +28,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.838983" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="0.8620774273198607" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -43,7 +43,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.784844" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="0.8034396468233571" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -58,7 +58,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.725728" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="0.7466201575935012" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -73,7 +73,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.902287" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="NaN" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -88,7 +88,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.8577" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="NaN" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -103,7 +103,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.779584" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="NaN" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -118,7 +118,7 @@
       <stationName>Purmer Stedelijk Uitstroompeil</stationName>
       <units>m</units>
     </header>
-    <event date="2022-10-21" time="22:00:00" value="0.7421" flag="0" />
+    <event date="2022-10-21" time="22:00:00" value="NaN" flag="0" />
     <comment></comment>
   </series>
 </TimeSeries>
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs
===================================================================
diff -u -r5754 -r5828
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs	(.../DamLiveHHNKTests.cs)	(revision 5754)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveHHNKTests.cs	(.../DamLiveHHNKTests.cs)	(revision 5828)
@@ -37,7 +37,6 @@
     
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")]
     public void CalculateStabilityUsingTestFilesHasExpectedResultsInOutputFile()
     {
         SetupStabilityProject();
@@ -46,7 +45,6 @@
         runner.Run();
 
         // Assertions
-        GeneralHelper.AssertNoErrors(runner);
         List<TimeSerie> series = runner.OutputTimeSeriesCollection.Series;
         var seriesCount = 0;
         var isFirstResultFound = false;
@@ -64,13 +62,13 @@
             if (timeSeries.LocationId == "Purmer_PU0042+00_K")
             {
                 TimeSerieEntry firstEntry = timeSeries.Entries.First();
-//                Assert.That(firstEntry.Value, Is.EqualTo(0.8555).Within(cTolerance), "The computed safety factory is not correct");
+                Assert.That(firstEntry.Value, Is.EqualTo(0.932).Within(cTolerance), "The computed safety factory is not correct");
                 isFirstResultFound = true;
             }
             if (timeSeries.LocationId == "Purmer_PU0110+20_R_V")
             {
                 TimeSerieEntry firstEntry = timeSeries.Entries.First();
-//                Assert.That(firstEntry.Value, Is.EqualTo(0.742).Within(cTolerance), "The computed safety factory is not correct");
+                Assert.That(firstEntry.Value, Is.NaN, "Expected NaN due to no uplift");
                 isLastResultFound = true;
             }
             seriesCount++;
Index: DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/live.OutputTimeSeries.xml
===================================================================
diff -u -r5363 -r5828
--- DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/live.OutputTimeSeries.xml	(.../live.OutputTimeSeries.xml)	(revision 5363)
+++ DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_inside/live.OutputTimeSeries.xml	(.../live.OutputTimeSeries.xml)	(revision 5828)
@@ -13,7 +13,7 @@
       <stationName>SD CS 1-1</stationName>
       <units>m</units>
     </header>
-    <event date="2008-12-17" time="01:00:00" value="1.518182" flag="0" />
+    <event date="2008-12-17" time="01:00:00" value="1.4386980236137041" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -28,7 +28,7 @@
       <stationName>SD CS 1-1</stationName>
       <units>m</units>
     </header>
-    <event date="2008-12-17" time="01:00:00" value="1.407606" flag="0" />
+    <event date="2008-12-17" time="01:00:00" value="1.2180679034883704" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -43,7 +43,7 @@
       <stationName>SD CS 1-1</stationName>
       <units>m</units>
     </header>
-    <event date="2008-12-17" time="01:00:00" value="1.273925" flag="0" />
+    <event date="2008-12-17" time="01:00:00" value="1.3753187376610643" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -58,7 +58,7 @@
       <stationName>SD CS 1-1</stationName>
       <units>m</units>
     </header>
-    <event date="2008-12-17" time="01:00:00" value="1.034127" flag="0" />
+    <event date="2008-12-17" time="01:00:00" value="1.3944908457262124" flag="0" />
     <comment></comment>
   </series>
   <series>
@@ -73,7 +73,7 @@
       <stationName>SD CS 1-1</stationName>
       <units>m</units>
     </header>
-    <event date="2008-12-17" time="01:00:00" value="1.135446" flag="0" />
+    <event date="2008-12-17" time="01:00:00" value="0.9974458416598924" flag="0" />
     <comment></comment>
   </series>
 </TimeSeries>
\ No newline at end of file
Index: DamClients/DamLive/trunk/data/DamLiveResults.xlsx
===================================================================
diff -u -r5719 -r5828
Binary files differ
Index: DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/live.OutputTimeSeries.xml
===================================================================
diff -u -r5586 -r5828
--- DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/live.OutputTimeSeries.xml	(.../live.OutputTimeSeries.xml)	(revision 5586)
+++ DamClients/DamLive/trunk/data/PulauTekong/PulauTekong_outside/live.OutputTimeSeries.xml	(.../live.OutputTimeSeries.xml)	(revision 5828)
@@ -1,4 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <TimeSeries version="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.wldelft.nl/fews/PI">
   <timeZone>0</timeZone>
+  <series>
+    <header>
+      <type>instantaneous</type>
+      <locationId>SD CS1 3-3</locationId>
+      <parameterId>StabilityOutsideFactor</parameterId>
+      <timeStep unit="second" multiplier="3600" divider="1" />
+      <startDate date="2008-12-17" time="01:00:00" />
+      <endDate date="2008-12-25" time="23:00:00" />
+      <missVal>-999</missVal>
+      <stationName>SD CS 1-1</stationName>
+      <units>m</units>
+    </header>
+    <event date="2008-12-17" time="01:00:00" value="1.221983445057588" flag="0" />
+    <comment></comment>
+  </series>
+  <series>
+    <header>
+      <type>instantaneous</type>
+      <locationId>SD CS2 8-8</locationId>
+      <parameterId>StabilityOutsideFactor</parameterId>
+      <timeStep unit="second" multiplier="3600" divider="1" />
+      <startDate date="2008-12-17" time="01:00:00" />
+      <endDate date="2008-12-25" time="23:00:00" />
+      <missVal>-999</missVal>
+      <stationName>SD CS 1-1</stationName>
+      <units>m</units>
+    </header>
+    <event date="2008-12-17" time="01:00:00" value="1.231318801904929" flag="0" />
+    <comment></comment>
+  </series>
+  <series>
+    <header>
+      <type>instantaneous</type>
+      <locationId>SD CS3 10-10</locationId>
+      <parameterId>StabilityOutsideFactor</parameterId>
+      <timeStep unit="second" multiplier="3600" divider="1" />
+      <startDate date="2008-12-17" time="01:00:00" />
+      <endDate date="2008-12-25" time="23:00:00" />
+      <missVal>-999</missVal>
+      <stationName>SD CS 1-1</stationName>
+      <units>m</units>
+    </header>
+    <event date="2008-12-17" time="01:00:00" value="1.2817188568053912" flag="0" />
+    <comment></comment>
+  </series>
 </TimeSeries>
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs
===================================================================
diff -u -r5754 -r5828
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs	(.../DamLivePulauTekongTests.cs)	(revision 5754)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongTests.cs	(.../DamLivePulauTekongTests.cs)	(revision 5828)
@@ -36,7 +36,6 @@
 
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")]
     public void CalculateStability2DInsideUsingTestFilesHasExpectedResultsInOutputFile()
     {
         const string testWorkingFolder = @".\damLivePulauTekongInside";
@@ -66,13 +65,13 @@
             {
                 isFirstResultFound = true;
                 TimeSerieEntry firstEntry = timeSeries.Entries.First();
-//                Assert.That(firstEntry.Value, Is.EqualTo(0.518).Within(cTolerance), "The computed safety factory is not correct");
+                Assert.That(firstEntry.Value, Is.EqualTo(1.439).Within(cTolerance), "The computed safety factory is not correct");
             }
             if (timeSeries.LocationId == "SD CS3 10-10")
             {
                 isLastResultFound = true;
                 TimeSerieEntry firstEntry = timeSeries.Entries.First();
-//                Assert.That(firstEntry.Value, Is.EqualTo(1.135).Within(cTolerance), "The computed safety factory is not correct");
+                Assert.That(firstEntry.Value, Is.EqualTo(0.997).Within(cTolerance), "The computed safety factory is not correct");
             }
             seriesCount++;
         }
@@ -86,7 +85,6 @@
 
     [Test]
     [Category("Integration")]
-    [Category("Work_In_Progress")]
     public void CalculateStability2DOutsideUsingTestFilesHasExpectedResultsInOutputFile()
     {
         const string testWorkingFolder = @".\damLivePulauTekongOutside";
@@ -117,13 +115,13 @@
             {
                 isFirstResultFound = true;
                 TimeSerieEntry firstEntry = timeSeries.Entries.First();
-//                Assert.That(firstEntry.Value, Is.EqualTo(0.939).Within(cTolerance), "The computed safety factory is not correct");
+                Assert.That(firstEntry.Value, Is.EqualTo(1.222).Within(cTolerance), "The computed safety factory is not correct");
             }
             if (timeSeries.LocationId == "SD CS3 10-10")
             {
                 isLastResultFound = true;
                 TimeSerieEntry firstEntry = timeSeries.Entries.First();
-//                Assert.That(firstEntry.Value, Is.EqualTo(1.280).Within(cTolerance), "The computed safety factory is not correct");
+                Assert.That(firstEntry.Value, Is.EqualTo(1.282).Within(cTolerance), "The computed safety factory is not correct");
             }
             seriesCount++;
         }