Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs
===================================================================
diff -u -r4625 -r4638
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs	(.../Geometry.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs	(.../Geometry.cs)	(revision 4638)
@@ -35,7 +35,7 @@
         public void CanCreateGeometryFormWkt()
         {
             var geom = Feature.Create(geomWktTestString);
-            Assert.IsNotNull(geom);
+            Assert.That(geom, Is.Not.Null);
             Assert.That(geom.WktFormat, Is.EqualTo(geomWktTestString));
         }
 
@@ -44,18 +44,17 @@
         {
             const string geomWkt = "POINT (0 0)";
             var geom = Feature.Create(geomWkt);
-            Assert.IsNotNull(geom);
+            Assert.That(geom, Is.Not.Null);
             Assert.That(geom.WktFormat, Is.EqualTo(geomWkt));
-            Assert.IsInstanceOf(typeof(Point), geom.Geometry);
+            Assert.That(geom.Geometry, Is.InstanceOf<Point>());
         }
 
         [Test]
         public void GeometryHasAnValidIdentity()
         {
             const string geomWkt = "POINT (0 0)";
             var geom = Feature.Create(geomWkt);
-            Assert.IsNotNull(geom);
-            Assert.IsNotNull(geom.Id);
+            Assert.That(geom, Is.Not.Null);
             Assert.That(geom.Id, Is.Not.EqualTo(Guid.Empty));
         }
 
@@ -64,7 +63,7 @@
         {
             const string geomWkt = "POINT (0 0)";
             var geom = Feature.Create(geomWkt);
-            Assert.IsNotNull(geom);
+            Assert.That(geom, Is.Not.Null);
 
             const string testvalue = "testvalue";
             geom.AddAttribute("test", testvalue);