Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePipingGrebbedijkTest.cs
===================================================================
diff -u -r3304 -r3331
--- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePipingGrebbedijkTest.cs	(.../DamLivePipingGrebbedijkTest.cs)	(revision 3304)
+++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLivePipingGrebbedijkTest.cs	(.../DamLivePipingGrebbedijkTest.cs)	(revision 3331)
@@ -26,6 +26,7 @@
 using Deltares.Dam.Application.Live;
 using Deltares.Dam.Data;
 using Deltares.DamLive.TestHelper;
+using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Standard.IO;
 using NUnit.Framework;
 
@@ -94,7 +95,18 @@
             DamProject.SetTestProgramVersion("19.2");
             var damData = DamProject.LoadData(projectFile);
             locations = damData.Locations;
-
+            foreach (var dikeLocation in locations)
+            {
+                var scenario = new Scenario();
+                scenario.RiverLevel = dikeLocation.SurfaceLine2.CharacteristicPoints
+                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + 1.5;
+                scenario.PolderLevel = dikeLocation.SurfaceLine2.CharacteristicPoints
+                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 0.6;
+                scenario.HeadPl3 = 1;
+                scenario.HeadPl4 = scenario.PolderLevel;
+                scenario.RequiredSafetyFactorStabilityInnerSlope = 1.2;
+                dikeLocation.Scenarios.Add(scenario);
+            }
             // Load the sensor time serie data (see input file for details)
             var inputTimeSeries = TimeSerieCollection.LoadFromFile(inputFile);
             ShortenTimeSeries(inputTimeSeries);
@@ -165,7 +177,6 @@
         ///  </summary>        
         [Test]
         [Category("Integration")]
-        [Category("Work_In_Progress")]
         public void CalculatePipingUsingTestFilesHasExpectedResultsInOutputFile()
         {
             const double cTolerance = 0.0005;
@@ -192,22 +203,26 @@
             var validParameterIDs = Enum.GetNames(typeof(TimeSerieParameters));
             foreach (var timeSeries in series)
             {
+                if (timeSeries.ParameterId.Contains("Piping"))
+                {
+                    timeSeries.ParameterId = TimeSerieParameters.PipingFactorWti.ToString();
+                }
                 Assert.IsTrue(validParameterIDs.Any(n => n == timeSeries.ParameterId));
                 Assert.IsTrue(locations.Any(l => l.Name == timeSeries.LocationId));
                 // StabilityInside check
-                if (timeSeries.ParameterId == TimeSerieParameters.StabilityInsideFactor.ToString())
+                if (timeSeries.ParameterId == TimeSerieParameters.PipingFactorWti.ToString())
                 {
                     if (timeSeries.LocationId == "grebbedijk1a")
                     {
                         var firstEntry = timeSeries.Entries.First();
-                        Assert.AreEqual(1.603, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                        Assert.AreEqual(4.132, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     }
                     if (timeSeries.LocationId == "grebbedijk3a")
                     {
                         var firstEntry = timeSeries.Entries.First();
                         // Following value was 0.590 in the previous DamLive version, but that has to do with how the 
                         // reference level Su is handled in D-GeoStability 18.1 and D-GeoStability 15.1
-                        Assert.AreEqual(1.007, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
+                        Assert.AreEqual(2.096, firstEntry.Value, cTolerance, "The computed safety factory is not correct");
                     }
                 }
 
Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.Dam.Application.Live/DamEngineRunner.cs
===================================================================
diff -u -r3295 -r3331
--- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.Dam.Application.Live/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 3295)
+++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.Dam.Application.Live/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 3331)
@@ -366,7 +366,8 @@
                                 Logger.LogWarning(calculationMessage.Message1);
                                 break;
                             case MessageMessageType.Error:
-                                Logger.LogError(calculationMessage.Message1);
+                                var exception = new Exception(calculationMessage.Message1);
+                                Logger.LogError(calculationMessage.Message1, exception);
                                 errorsFound = true;
                                 break;
                         }
Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs
===================================================================
diff -u -r3304 -r3331
--- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs	(.../DamLiveGrebbedijkTest.cs)	(revision 3304)
+++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs	(.../DamLiveGrebbedijkTest.cs)	(revision 3331)
@@ -96,18 +96,7 @@
             DamProject.SetTestProgramVersion("19.2");
             var damData = DamProject.LoadData(projectFile);
             locations = damData.Locations;
-            foreach (var dikeLocation in locations)
-            {
-                var scenario = new Scenario();
-                scenario.RiverLevel = dikeLocation.SurfaceLine2.CharacteristicPoints
-                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + 1.5;
-                scenario.PolderLevel = dikeLocation.SurfaceLine2.CharacteristicPoints
-                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 0.6;
-                scenario.HeadPl3 = 1;
-                scenario.HeadPl4 = scenario.PolderLevel;
-                scenario.RequiredSafetyFactorStabilityInnerSlope = 1.2;
-                dikeLocation.Scenarios.Add(scenario);
-            }
+            
             // Load the sensor time serie data (see input file for details)
             var inputTimeSeries = TimeSerieCollection.LoadFromFile(inputFile);
             ShortenTimeSeries(inputTimeSeries);
@@ -184,6 +173,20 @@
             const double cTolerance = 0.0005;
             SetupStabilityProject();
             runner.Initialize();
+            // Old projects do not have scenarios, so in order to (re-)use them this must be added here. Note that this changes the results.
+            foreach (var dikeLocation in runner.DamProjectData.Locations)
+            {
+                var scenario = new Scenario();
+                scenario.RiverLevel = dikeLocation.SurfaceLine2.CharacteristicPoints
+                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + 1.5;
+                scenario.PolderLevel = dikeLocation.SurfaceLine2.CharacteristicPoints
+                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 0.6;
+                scenario.HeadPl3 = 1;
+                scenario.HeadPl4 = scenario.PolderLevel;
+                scenario.RequiredSafetyFactorStabilityInnerSlope = 1.2;
+                scenario.Location = dikeLocation;
+                dikeLocation.Scenarios.Add(scenario);
+            }
 
             Assert.IsNotNull(runner);
             Assert.IsNotNull(runner.DamProjectData);
@@ -192,12 +195,9 @@
             Assert.IsNotNull(runner.CalculationParameters.MStabParameters);
 
             runner.Run();
-            //runner.WriteResultsToFile(outputFile);
-
+            
             AssertNoErrors();
-
-            // Assertions
-
+            
             var series = runner.OutputTimeSeriesCollection.Series;
 
             int seriesCount = 0;
Index: DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r3304 -r3331
--- DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 3304)
+++ DamClients/DamLive/branches/DamLive 19.2/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 3331)
@@ -29,7 +29,6 @@
 using Deltares.DamLive.TestHelper;
 using Deltares.Standard.IO;
 using NUnit.Framework;
-using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.Geotechnics;
 
 namespace Deltares.DamLive.Tests