Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs	(.../DesignCalculatorTests.cs)	(revision 4000)
@@ -19,10 +19,12 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Globalization;
 using System.IO;
 using System.Threading;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
+using Deltares.DamEngine.Io.XmlOutput;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
@@ -38,13 +40,13 @@
             // Set Analysis type to "No Adaption"
             // Set model to Piping Sellmeijer Revised (WBI)
             // Select first location (100)
-            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             const string fileName = @"TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(1, output.Results.CalculationMessages.Length);
             Assert.AreEqual(null, output.Results.CalculationResults);
             Assert.AreEqual("No segments with failure mechanism Piping present", output.Results.CalculationMessages[0].Message1);
@@ -58,13 +60,13 @@
             // Set Analysis type to "No Adaption"
             // Select Failure mechanism Stability Inside
             // Select second location (101)
-            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             const string fileName = @"TestFiles\Rechter Diezedijk_NoStabilityInsideInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(1, output.Results.CalculationMessages.Length);
             Assert.AreEqual(null, output.Results.CalculationResults);
             Assert.AreEqual("Geen segmenten met faalmechanisme StabilityInside aanwezig", output.Results.CalculationMessages[0].Message1);
@@ -75,34 +77,34 @@
         public void TestInvalidInputXMLForOldDGeoStability()
         {
             // Based on InputFile.xml as produced by DAM UI in debug mode
-            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             const string fileName = @"TestFiles\InputFileForDGeoStability.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             // As the data is not entirely correct for the new kernel, we expect 1 error.
             Assert.AreEqual(1, output.Results.CalculationMessages.Length);
             Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains(
-                "De berekening is mislukt met de volgende foutmelding"), output.Results.CalculationMessages[0].Message1);
+                              "De berekening is mislukt met de volgende foutmelding"), output.Results.CalculationMessages[0].Message1);
         }
 
         [Test]
         [SetUICulture("nl-NL")]
         public void TestValidInputXML()
         {
             // Based on DeltaDijkInputFile.xml (1D, UpliftVan, Design, No Adaption) as produced by DAM UI in debug mode
-            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             const string fileName = @"TestFiles\DeltaDijkInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             // We get 606 warnings in total when using the official release of the macro stability kernel. When we use the latest trunk version, we get 619 errors
             // So as long as the latest version is not (yet) released we have to check both values because otherwise it will either fail locally or on TC.
-            Assert.IsTrue(606 == output.Results.CalculationMessages.Length || 619 == output.Results.CalculationMessages.Length, "Number of messages found = "+ output.Results.CalculationMessages.Length.ToString()) ;
+            Assert.IsTrue(606 == output.Results.CalculationMessages.Length || 619 == output.Results.CalculationMessages.Length, "Number of messages found = " + output.Results.CalculationMessages.Length);
         }
     }
 }
\ No newline at end of file