Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs	(.../Geometry.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs	(.../Geometry.cs)	(revision 4625)
@@ -36,7 +36,7 @@
         {
             var geom = Feature.Create(geomWktTestString);
             Assert.IsNotNull(geom);
-            Assert.AreEqual(geomWktTestString, geom.WktFormat);
+            Assert.That(geom.WktFormat, Is.EqualTo(geomWktTestString));
         }
 
         [Test]
@@ -45,7 +45,7 @@
             const string geomWkt = "POINT (0 0)";
             var geom = Feature.Create(geomWkt);
             Assert.IsNotNull(geom);
-            Assert.AreEqual(geomWkt, geom.WktFormat);
+            Assert.That(geom.WktFormat, Is.EqualTo(geomWkt));
             Assert.IsInstanceOf(typeof(Point), geom.Geometry);
         }
 
@@ -56,7 +56,7 @@
             var geom = Feature.Create(geomWkt);
             Assert.IsNotNull(geom);
             Assert.IsNotNull(geom.Id);
-            Assert.AreNotEqual(Guid.Empty, geom.Id);
+            Assert.That(geom.Id, Is.Not.EqualTo(Guid.Empty));
         }
 
         [Test]
@@ -68,7 +68,7 @@
 
             const string testvalue = "testvalue";
             geom.AddAttribute("test", testvalue);
-            Assert.AreEqual(testvalue, geom["test"]);
+            Assert.That(geom["test"], Is.EqualTo(testvalue));
         }
 
         #region Setup