Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs	(.../CsvParserTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs	(.../CsvParserTest.cs)	(revision 4625)
@@ -86,17 +86,17 @@
     public void CanParseHeaderWithSemicolonSeparatedItems()
     {
         string[] items = CsvParser.ParseHeader("header1;header 2", new Regex(CsvParser.CsvSplitPatternSemicolonOnly));
-        Assert.AreEqual(2, items.Length);
-        Assert.AreEqual("header1", items[0]);
-        Assert.AreEqual("header 2", items[1]);
+        Assert.That(items.Length, Is.EqualTo(2));
+        Assert.That(items[0], Is.EqualTo("header1"));
+        Assert.That(items[1], Is.EqualTo("header 2"));
     }
 
     [Test]
     public void CannotParseHeaderWithCommaSeparatedItems()
     {
         string[] items = CsvParser.ParseHeader("header1,header 2", new Regex(CsvParser.CsvSplitPatternSemicolonOnly));
-        Assert.AreEqual(1, items.Length);
-        Assert.AreEqual("header1,header 2", items[0]);
+        Assert.That(items.Length, Is.EqualTo(1));
+        Assert.That(items[0], Is.EqualTo("header1,header 2"));
     }
 
     [Test]
@@ -179,9 +179,9 @@
         loader.Add("name", (entity, value) => entity.Name = value);
         loader.Add("age", (entity, value) => entity.Age = int.Parse(value));
         List<Foo> items = loader.LoadFromCsvFile(testFile).ToList();
-        Assert.AreEqual(4, items.Count);
-        Assert.AreEqual("Tom", items.ElementAt(2).Name);
-        Assert.AreEqual(48, items.ElementAt(2).Age);
+        Assert.That(items.Count, Is.EqualTo(4));
+        Assert.That(items.ElementAt(2).Name, Is.EqualTo("Tom"));
+        Assert.That(items.ElementAt(2).Age, Is.EqualTo(48));
     }
 
     private class Foo