Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs
===================================================================
diff -u -r4163 -r4164
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4163)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanGridTest.cs	(.../StabilityInsideUpliftVanGridTest.cs)	(revision 4164)
@@ -106,68 +106,83 @@
             // StabilityInside check
             if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
             {
-                resultsCount += timeSeries.Entries.Count;
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
                     Assert.AreEqual(1.456, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                   //  Assert.AreEqual(1.583, 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.366, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     //Assert.AreEqual(1.480, 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.248, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                 //    Assert.AreEqual(1.359, 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.172, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                   //  Assert.AreEqual(1.271, 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++;
                 }
 
             }
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs
===================================================================
diff -u -r4162 -r4164
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4162)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideBishopGridTest.cs	(.../StabilityInsideBishopGridTest.cs)	(revision 4164)
@@ -109,69 +109,84 @@
             // StabilityInside check
             if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
             {
-                resultsCount += timeSeries.Entries.Count;
                 if (timeSeries.LocationId == "Purmer_PU0042+00_K")
                 {
                     TimeSerieEntry firstEntry = timeSeries.Entries.First();
                     Assert.AreEqual(1.548, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.725, 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.493, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.649, 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.324, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.479, 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.279, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.419, 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(1.536, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.702, 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(1.480, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.636, 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(1.317, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.462, 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(1.270, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                     TimeSerieEntry lastEntry = timeSeries.Entries.Last();
                     Assert.AreEqual(1.406, lastEntry.Value, cTolerance, "The computed safety factory is not correct");
+                    resultsCount++;
                 }
             }
 
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs
===================================================================
diff -u -r4162 -r4164
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4162)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/StabilityInsideUpliftVanBeeSwarmTest.cs	(.../StabilityInsideUpliftVanBeeSwarmTest.cs)	(revision 4164)
@@ -105,68 +105,83 @@
             // StabilityInside check
             if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
             {
-                resultsCount += timeSeries.Entries.Count;
                 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++;
                 }
             }