Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs
===================================================================
diff -u -r4625 -r4638
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs	(.../DikeTest.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs	(.../DikeTest.cs)	(revision 4638)
@@ -137,13 +137,13 @@
     [Test]
     public void TestDikeIntegrity()
     {
-        Assert.IsNotNull(dike);
+        Assert.That(dike, Is.Not.Null);
 
         Assert.That(dike.Name, Is.EqualTo("Dike"));
         //Assert.IsNotNull(this.dike.Segments);
-        Assert.IsNotNull(dike.Locations);
-        Assert.IsNotNull(dike.SurfaceLines2);
-        Assert.IsNotNull(dike.SoilProfiles);
+        Assert.That(dike.Locations, Is.Not.Null);
+        Assert.That(dike.SurfaceLines2, Is.Not.Null);
+        Assert.That(dike.SoilProfiles, Is.Not.Null);
     }
 
 //        [Test]
@@ -160,7 +160,7 @@
     [Test]
     public void TestDikeLocations()
     {
-        Assert.IsNotNull(location1);
+        Assert.That(location1, Is.Not.Null);
 
         Assert.That(dike.Locations.Count, Is.EqualTo(1));
         Assert.That(dike.Locations[0], Is.EqualTo(location1));
@@ -170,8 +170,8 @@
     [Test]
     public void TestDikeSurfaceLines()
     {
-        Assert.IsNotNull(surfaceLine1);
-        Assert.IsNotNull(surfaceLine1.Geometry.Points);
+        Assert.That(surfaceLine1, Is.Not.Null);
+        Assert.That(surfaceLine1.Geometry.Points, Is.Not.Null);
 
         Assert.That(dike.SurfaceLines2.Count, Is.EqualTo(1));
         Assert.That(dike.SurfaceLines2[0], Is.EqualTo(surfaceLine1));
@@ -181,7 +181,7 @@
     [Test]
     public void TestDikeSoilProfiles()
     {
-        Assert.IsNotNull(soilProfile);
+        Assert.That(soilProfile, Is.Not.Null);
 
         Assert.That(dike.SoilProfiles.Count, Is.EqualTo(1));
         Assert.That(dike.SoilProfiles[0], Is.EqualTo(soilProfile));
@@ -191,14 +191,14 @@
     [Test]
     public void TestDikeLocationSegments()
     {
-        Assert.IsNotNull(location1.Segment);
+        Assert.That(location1.Segment, Is.Not.Null);
         Assert.That(location1.Segment, Is.EqualTo(segment1));
     }
 
     [Test]
     public void TestDikeLocationSurfaceLines()
     {
-        Assert.IsNotNull(location1.SurfaceLine2);
+        Assert.That(location1.SurfaceLine2, Is.Not.Null);
         Assert.That(location1.SurfaceLine2, Is.EqualTo(surfaceLine1));
     }
 
@@ -227,7 +227,7 @@
         Assert.That(surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None), Is.EqualTo(0));
         Assert.That(surfaceLine1.GetCharacteristicPoints(points[1]).First(), Is.EqualTo(CharacteristicPointType.DikeToeAtRiver));
 
-        Assert.IsTrue(surfaceLine1.HasDike());
+        Assert.That(surfaceLine1.HasDike(), Is.True);
     }
 
     [Test]