Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 4000)
@@ -25,6 +25,7 @@
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
+using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
@@ -49,7 +50,7 @@
             const string fileName = @"PipingVoorbeeld1_SellmeijerVNKInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString());
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             // Factor piping = 0.463
@@ -70,7 +71,7 @@
             // ID locatie scenario = "1"
             // Heave Factor = 90.0
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.IsNotNull(output.Results.CalculationResults, "No results available");
             Assert.AreEqual(0.463, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
             Assert.AreEqual(1.759, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkHcritical, tolerance);
@@ -97,11 +98,11 @@
             // Change required safety factor piping to 1.01
             const string fileName = @"PipingVoorbeeld1_SellmeijerVNKDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
             SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].PipingDesignResults.RedesignedSurfaceLine;
             // uplift = true
@@ -153,22 +154,22 @@
             // Set Analysis type to "Adapt geometry"
             const string fileName = @"PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
 
             Assert.AreEqual(CalculationResult.RunFailed, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult));
             // expected value = -1 because exception was raised for the shoulder length
             Assert.AreEqual(-1.0, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor, tolerance);
-            Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.", 
-                output.Results.CalculationResults[0].PipingDesignResults.ResultMessage);
+            Assert.AreEqual("The new shoulder length is too large to fit in the current surface line.",
+                            output.Results.CalculationResults[0].PipingDesignResults.ResultMessage);
             Assert.AreEqual("Location 'Profiel 1', subsoil scenario 'soilprofile_01', design scenario '1': " +
                             "The calculation failed with error message " +
                             "'The design was not successful. " +
                             "The new shoulder length is too large to fit in the current surface line.'",
-                output.Results.CalculationMessages[0].Message1);
+                            output.Results.CalculationMessages[0].Message1);
         }
 
         [Test]
@@ -179,16 +180,15 @@
             // Set Analysis type to "Adapt geometry"
             const string fileName = @"DeltaDijkInvoer3VNKAdaptionShoulderLength.xml";
             string inputString = File.ReadAllText(fileName);
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
 
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult));
             Assert.AreEqual(true, output.Results.CalculationResults[0].PipingDesignResults.SellmeijerVnkFactor > -1);
             Assert.AreEqual("", output.Results.CalculationResults[0].PipingDesignResults.ResultMessage);
         }
-
     }
-}
+}
\ No newline at end of file