Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 4000)
@@ -65,33 +65,33 @@
             inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
             inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"Operational\Grebbedijk\input.Geometries\");
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"Operational\Grebbedijk\input0.soilmaterials.mdb");
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
-            foreach (var dikeLocation in engineInterface.DamProjectData.Dike.Locations)
+            foreach (Location dikeLocation in engineInterface.DamProjectData.Dike.Locations)
             {
                 var scenario = new DesignScenario();
                 scenario.RiverLevel = dikeLocation.SurfaceLine.CharacteristicPoints
-                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + 1.5;
+                                                  .GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + 1.5;
                 scenario.PolderLevel = dikeLocation.SurfaceLine.CharacteristicPoints
-                    .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 0.6;
+                                                   .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z - 0.6;
                 scenario.HeadPl3 = 1;
                 scenario.HeadPl4 = scenario.PolderLevel;
                 scenario.RequiredSafetyFactorStabilityInnerSlope = 1.2;
                 dikeLocation.Scenarios.Add(scenario);
             }
+
             string result = engineInterface.Validate();
             Assert.IsNull(result, "Validation must succeed but does not, see validation output xml in debugger");
             string outputString = engineInterface.Run();
             File.WriteAllText(outputFileName, outputString, Encoding.Unicode);
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(2.321, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance);
             Assert.AreEqual(2.321, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[1].Value, tolerance);
             // Following values were 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(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance);
             Assert.AreEqual(2.326, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[1].Value, tolerance);
-
         }
 
         //[TestCase(PipingModelType.Bligh)] //ToDo add succesfull test for Bligh/SellmeijerVnk
@@ -117,7 +117,7 @@
             inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
             inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"Operational\Grebbedijk\input.Geometries\");
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"Operational\Grebbedijk\input0.soilmaterials.mdb");
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping;
             engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel;
@@ -145,18 +145,18 @@
             inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
             inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", baseTestDirectory + @"Operational\Grebbedijk\input.Geometries\");
             inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", baseTestDirectory + @"Operational\Grebbedijk\input0.soilmaterials.mdb");
-            EngineInterface engineInterface = new EngineInterface(inputString);
+            var engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
             engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping;
             engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel;
             string outputString = engineInterface.Run();
             Assert.IsNotNull(outputString);
-            var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
-            Assert.AreEqual(2,output.Results.CalculationMessages.Length);
+            Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
+            Assert.AreEqual(2, output.Results.CalculationMessages.Length);
             Assert.AreEqual(MessageMessageType.Info, output.Results.CalculationMessages[0].MessageType);
             Assert.AreEqual("There are 2 locations with sensor data", output.Results.CalculationMessages[0].Message1);
             Assert.AreEqual(MessageMessageType.Error, output.Results.CalculationMessages[1].MessageType);
             Assert.AreEqual("No segments with failure mechanism Piping present", output.Results.CalculationMessages[1].Message1);
         }
     }
-}
+}
\ No newline at end of file