Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ObjectMaterializerTest.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ObjectMaterializerTest.cs	(.../ObjectMaterializerTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ObjectMaterializerTest.cs	(.../ObjectMaterializerTest.cs)	(revision 4625)
@@ -33,7 +33,7 @@
         {
             var materializer = new ObjectMaterializer<Foo>();
             materializer.Add("name", (entity, value) => entity.Name = value);
-            Assert.AreEqual(1, materializer.Count);
+            Assert.That(materializer.Count, Is.EqualTo(1));
         }
 
         [Test]
@@ -42,7 +42,7 @@
             var materializer = new ObjectMaterializer<Foo>();
             materializer.Add("name", (entity, value) => entity.Name = value);
             materializer.Remove("name");
-            Assert.AreEqual(0, materializer.Count);
+            Assert.That(materializer.Count, Is.EqualTo(0));
         }
 
         [Test]
@@ -72,8 +72,8 @@
             materializer["name"](foo, "Foo's name");
             materializer["age"](foo, "10");
 
-            Assert.AreEqual(10, foo.Age);
-            Assert.AreEqual("Foo's name", foo.Name);
+            Assert.That(foo.Age, Is.EqualTo(10));
+            Assert.That(foo.Name, Is.EqualTo("Foo's name"));
         }
 
         class Foo