Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 4624)
@@ -77,10 +77,10 @@
     {
         const string inputFileName = @"TestFiles\AquiferListInputFile.xml";
         Input input = DamXmlSerialization.LoadInputFromXmlFile(inputFileName);
-        Assert.AreEqual(28, input.AquiferSoils.Length);
+        Assert.That(input.AquiferSoils.Length, Is.EqualTo(28));
         DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input);
-        Assert.AreEqual(11, actualDamProjectData.Dike.SoilList.AquiferDictionary.Count);
-        Assert.AreEqual(7, actualDamProjectData.CalculationMessages.Count);
+        Assert.That(actualDamProjectData.Dike.SoilList.AquiferDictionary.Count, Is.EqualTo(11));
+        Assert.That(actualDamProjectData.CalculationMessages.Count, Is.EqualTo(7));
     }
 
     [Test]
@@ -142,7 +142,7 @@
 
     private void CompareDamProjectData(DamProjectData actual, DamProjectData expected)
     {
-        Assert.AreEqual(FactoryForDamProjectData.ExpectedAnalysisType, DamProjectCalculationSpecification.SelectedAnalysisType);
+        Assert.That(DamProjectCalculationSpecification.SelectedAnalysisType, Is.EqualTo(FactoryForDamProjectData.ExpectedAnalysisType));
 
         var compare = new CompareLogic
         {
@@ -165,7 +165,7 @@
             "Loops"
         }; // TODO i.m.o the serializing of the geometry should be improved, so these ignores are not needed anymore
         ComparisonResult result = compare.Compare(expected, actual);
-        Assert.AreEqual(0, result.Differences.Count,
+        Assert.That(result.Differences.Count, Is.EqualTo(0),
                         "Differences found read/write Input object:" + result.DifferencesString);
     }
 }
\ No newline at end of file