Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs
===================================================================
diff -u -r4624 -r6198
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs	(.../DamXmlSerializationTests.cs)	(revision 4624)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/DamXmlSerializationTests.cs	(.../DamXmlSerializationTests.cs)	(revision 6198)
@@ -19,9 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.IO;
-using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.DamEngine.Io.XmlOutput;
 using KellermanSoftware.CompareNetObjects;
@@ -58,51 +55,14 @@
         CompareOutput(sourceOutput, destinationOutput);
     }
 
-    [TestCase(1)]
-    [TestCase(2)]
-    public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(int oldPipingModel)
+    private static Input CreatePopulatedInput()
     {
-        // testcase 1 = old model PipingModelType.Sellmeijer4Forces
-        // testcase 2 = old model PipingModelType.SellmeijerVnk
-        const string calcDir = "TestOperationalGrebbedijk";
-        const string localWorkingDir = @".\";
-        const string baseTestDirectory = @".\";
-        if (Directory.Exists(calcDir))
-        {
-            Directory.Delete(calcDir, true); // delete previous results
-        }
-
-        Directory.CreateDirectory(calcDir);
-        // Switch to TestFiles directory to check if DamLive can also run from another directory
-        string oldLocalWorkingDir = Directory.GetCurrentDirectory();
-        try
-        {
-            Directory.SetCurrentDirectory(localWorkingDir);
-            // Based on "DamLive\trunk\src\Deltares.DamLive.Tests\TestData\DamLive\Set2\\output.damx", assume 4Forces
-            string inputFileName = baseTestDirectory + @"\TestFiles\GrebbedijkStability4Forces.xml";
-            if (oldPipingModel == 2)
-            {
-                inputFileName = baseTestDirectory + @"\TestFiles\GrebbedijkStabilityVNK.xml";
-            }
-
-            string inputString = File.ReadAllText(inputFileName);
-            Assert.That(() => new EngineInterface(inputString),
-                        Throws.TypeOf(typeof(NotImplementedException)).With.Message.EqualTo("The method or operation is not implemented."));
-        }
-        finally
-        {
-            Directory.SetCurrentDirectory(oldLocalWorkingDir);
-        }
-    }
-
-    private Input CreatePopulatedInput()
-    {
         var input = new Input();
         input.DamProjectType = InputDamProjectType.Design;
         return input;
     }
 
-    private void CompareInput(Input expected, Input actual)
+    private static void CompareInput(Input expected, Input actual)
     {
         var compare = new CompareLogic
         {
@@ -112,10 +72,10 @@
             }
         };
         ComparisonResult result = compare.Compare(expected, actual);
-        Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Input object");
+        Assert.That(result.Differences, Is.Empty, "Differences found read/write Input object");
     }
 
-    private Output CreatePopulatedOutput()
+    private static Output CreatePopulatedOutput()
     {
         var output = new Output();
         output.Results = new OutputResults();
@@ -138,7 +98,7 @@
         return output;
     }
 
-    private void CompareOutput(Output expected, Output actual)
+    private static void CompareOutput(Output expected, Output actual)
     {
         var compare = new CompareLogic
         {
@@ -148,6 +108,6 @@
             }
         };
         ComparisonResult result = compare.Compare(expected, actual);
-        Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Output object");
+        Assert.That(result.Differences, Is.Empty, "Differences found read/write Output object");
     }
 }
\ No newline at end of file