Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs	(.../GeometryDataTests.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs	(.../GeometryDataTests.cs)	(revision 4624)
@@ -71,29 +71,29 @@
         geometrymodel.RemoveDoublesFromNewlyEffectedPointsAndCurves();
 
         // only two points are unique by location
-        Assert.AreEqual(2, geometrymodel.NewlyEffectedPoints.Count);
+        Assert.That(geometrymodel.NewlyEffectedPoints.Count, Is.EqualTo(2));
         // only two curves hold both head and endpoint with unique locations
-        Assert.AreEqual(1, geometrymodel.NewlyEffectedCurves.Count);
+        Assert.That(geometrymodel.NewlyEffectedCurves.Count, Is.EqualTo(1));
     }
 
     [Test]
     public void GeometryHelperTestSurfaceTwoVertLayers()
     {
         GeometryData gData = CreateGeometrySurface2();
         GeometryPointString line = gData.SurfaceLine;
-        Assert.AreEqual(3, line.Points.Count);
-        Assert.AreEqual(1.0, line.Points.OrderBy(p => p.X).First().X);
-        Assert.AreEqual(10.0, line.Points.OrderByDescending(p => p.X).First().X);
+        Assert.That(line.Points.Count, Is.EqualTo(3));
+        Assert.That(line.Points.OrderBy(p => p.X).First().X, Is.EqualTo(1.0));
+        Assert.That(line.Points.OrderByDescending(p => p.X).First().X, Is.EqualTo(10.0));
     }
 
     [Test]
     public void GeometryDataTestSurfaceTwoHorLayers()
     {
         GeometryData gData = CreateGeometrySurface();
         GeometryPointString line = gData.SurfaceLine;
-        Assert.AreEqual(2, line.CalcPoints.Count);
-        Assert.AreEqual(1.0, line.CalcPoints.OrderBy(p => p.X).First().X);
-        Assert.AreEqual(10.0, line.CalcPoints.OrderByDescending(p => p.X).First().X);
+        Assert.That(line.CalcPoints.Count, Is.EqualTo(2));
+        Assert.That(line.CalcPoints.OrderBy(p => p.X).First().X, Is.EqualTo(1.0));
+        Assert.That(line.CalcPoints.OrderByDescending(p => p.X).First().X, Is.EqualTo(10.0));
     }
 
     [Test]
@@ -119,13 +119,13 @@
         geom.NewlyEffectedCurves.Add(new GeometryCurve(p2, p4));
         geom.RegenerateGeometry();
 
-        Assert.AreEqual(4, geom.Points.Count);
-        Assert.AreEqual(4, geom.Curves.Count);
-        Assert.AreEqual(1, geom.Surfaces.Count);
-        Assert.AreEqual(0, geom.Surfaces[0].InnerLoops.Count);
-        Assert.AreEqual(4, geom.Surfaces[0].OuterLoop.Count);
-        Assert.AreEqual(4, geom.Surfaces[0].OuterLoop.CurveList.Count);
-        Assert.AreEqual(4, geom.Surfaces[0].OuterLoop.Points.Count);
+        Assert.That(geom.Points.Count, Is.EqualTo(4));
+        Assert.That(geom.Curves.Count, Is.EqualTo(4));
+        Assert.That(geom.Surfaces.Count, Is.EqualTo(1));
+        Assert.That(geom.Surfaces[0].InnerLoops.Count, Is.EqualTo(0));
+        Assert.That(geom.Surfaces[0].OuterLoop.Count, Is.EqualTo(4));
+        Assert.That(geom.Surfaces[0].OuterLoop.CurveList.Count, Is.EqualTo(4));
+        Assert.That(geom.Surfaces[0].OuterLoop.Points.Count, Is.EqualTo(4));
         Assert.IsTrue(geom.Surfaces[0].OuterLoop.HasArea());
         Assert.IsTrue(geom.Surfaces[0].OuterLoop.IsLoop());
         Assert.IsTrue(geom.Surfaces[0].OuterLoop.IsPointInLoopArea(new Point2D(25, 3)));