Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r4625 -r4638
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 4638)
@@ -99,7 +99,7 @@
                 foreach (Location location in projectData.Locations)
                 {
                     // surfaceline2 present with characteristic points ?
-                    Assert.NotNull(location.SurfaceLine2);
+                    Assert.That(location.SurfaceLine2, Is.Not.Null);
                     Assert.That(location.SurfaceLine2.Name, Is.EqualTo(location.Name));
                     Assert.That(location.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint, Is.EqualTo(true));
                     Assert.That(location.SurfaceLine2.HasDike(), Is.EqualTo(true));
@@ -612,12 +612,12 @@
         {
             const double accuracy = 0.01;
             // quick check for surfaceline2 conversion
-            Assert.NotNull(actualLocation.SurfaceLine2);
+            Assert.That(actualLocation.SurfaceLine2, Is.Not.Null);
             Assert.That(actualLocation.SurfaceLine2.Name, Is.EqualTo("TPL_Hempolder_0100"));
             Assert.That(actualLocation.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint, Is.EqualTo(true));
             Assert.That(actualLocation.SurfaceLine2.HasDike(), Is.EqualTo(true));
             CharacteristicPoint dikeToeAtRiver = actualLocation.SurfaceLine2.CharacteristicPoints.FirstOrDefault(p => p.CharacteristicPointType == CharacteristicPointType.DikeToeAtRiver);
-            Assert.NotNull(dikeToeAtRiver);
+            Assert.That(dikeToeAtRiver, Is.Not.Null);
             Assert.That(dikeToeAtRiver.X, Is.EqualTo(111222.28).Within(accuracy));
             Assert.That(dikeToeAtRiver.Y, Is.EqualTo(507206.24).Within(accuracy));
         }