Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs	(.../GeometryLoopTests.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs	(.../GeometryLoopTests.cs)	(revision 4624)
@@ -38,9 +38,9 @@
         var loop = new GeometryLoop();
 
         // assert
-        Assert.AreEqual(loop.Points.Count, loop.Count);
-        Assert.AreEqual(String.Empty, loop.Name);
-        CollectionAssert.IsEmpty(loop.Points);
+        Assert.That(loop.Count, Is.EqualTo(loop.Points.Count));
+        Assert.That(loop.Name, Is.EqualTo(String.Empty));
+        Assert.That(loop.Points, Is.Empty);
         //Assert.AreEqual(String.Empty, loop.PointsDescription);
 
         Assert.IsEmpty(loop.CurveList);
@@ -349,7 +349,7 @@
         }
 
         int pointCount = loop.CalcPoints.Count;
-        Assert.AreEqual(curveCount == 0 ? 0 : curveCount + 1, pointCount);
+        Assert.That(pointCount, Is.EqualTo(curveCount == 0 ? 0 : curveCount + 1));
 
         // call
         TestDelegate call = () => loop.IsClockWise();
@@ -448,9 +448,9 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(2, points.Count);
-        Assert.AreSame(curve1.EndPoint, points[0]);
-        Assert.AreSame(curve1.HeadPoint, points[1]);
+        Assert.That(points.Count, Is.EqualTo(2));
+        Assert.That(points[0], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[1], Is.SameAs(curve1.HeadPoint));
     }
 
     [Test]
@@ -480,14 +480,14 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(7, points.Count);
-        Assert.AreSame(curve1.HeadPoint, points[0]);
-        Assert.AreSame(curve1.EndPoint, points[1]);
-        Assert.AreSame(curve2.HeadPoint, points[2]);
-        Assert.AreSame(curve3.EndPoint, points[3]);
-        Assert.AreSame(curve4.HeadPoint, points[4]);
-        Assert.AreSame(curve5.EndPoint, points[5]);
-        Assert.AreSame(curve6.EndPoint, points[6]);
+        Assert.That(points.Count, Is.EqualTo(7));
+        Assert.That(points[0], Is.SameAs(curve1.HeadPoint));
+        Assert.That(points[1], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[2], Is.SameAs(curve2.HeadPoint));
+        Assert.That(points[3], Is.SameAs(curve3.EndPoint));
+        Assert.That(points[4], Is.SameAs(curve4.HeadPoint));
+        Assert.That(points[5], Is.SameAs(curve5.EndPoint));
+        Assert.That(points[6], Is.SameAs(curve6.EndPoint));
     }
 
     [Test]
@@ -521,15 +521,15 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(8, points.Count);
-        Assert.AreSame(curve1.HeadPoint, points[0]);
-        Assert.AreSame(curve1.EndPoint, points[1]);
-        Assert.AreSame(curve2.HeadPoint, points[2]);
-        Assert.AreSame(curve3.EndPoint, points[3]);
-        Assert.AreSame(curve4.HeadPoint, points[4]);
-        Assert.AreSame(curve5.EndPoint, points[5]);
-        Assert.AreSame(curve6.EndPoint, points[6]);
-        Assert.AreSame(curve9.HeadPoint, points[7]);
+        Assert.That(points.Count, Is.EqualTo(8));
+        Assert.That(points[0], Is.SameAs(curve1.HeadPoint));
+        Assert.That(points[1], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[2], Is.SameAs(curve2.HeadPoint));
+        Assert.That(points[3], Is.SameAs(curve3.EndPoint));
+        Assert.That(points[4], Is.SameAs(curve4.HeadPoint));
+        Assert.That(points[5], Is.SameAs(curve5.EndPoint));
+        Assert.That(points[6], Is.SameAs(curve6.EndPoint));
+        Assert.That(points[7], Is.SameAs(curve9.HeadPoint));
     }
 
     [Test]
@@ -549,10 +549,10 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(3, points.Count);
-        Assert.AreSame(curve1.HeadPoint, points[0]);
-        Assert.AreSame(curve1.EndPoint, points[1]);
-        Assert.AreSame(curve2.HeadPoint, points[2]);
+        Assert.That(points.Count, Is.EqualTo(3));
+        Assert.That(points[0], Is.SameAs(curve1.HeadPoint));
+        Assert.That(points[1], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[2], Is.SameAs(curve2.HeadPoint));
     }
 
     [Test]
@@ -572,10 +572,10 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(3, points.Count);
-        Assert.AreSame(curve1.HeadPoint, points[0]);
-        Assert.AreSame(curve1.EndPoint, points[1]);
-        Assert.AreSame(curve2.EndPoint, points[2]);
+        Assert.That(points.Count, Is.EqualTo(3));
+        Assert.That(points[0], Is.SameAs(curve1.HeadPoint));
+        Assert.That(points[1], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[2], Is.SameAs(curve2.EndPoint));
     }
 
     [Test]
@@ -595,10 +595,10 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(3, points.Count);
-        Assert.AreSame(curve1.EndPoint, points[0]);
-        Assert.AreSame(curve1.HeadPoint, points[1]);
-        Assert.AreSame(curve2.HeadPoint, points[2]);
+        Assert.That(points.Count, Is.EqualTo(3));
+        Assert.That(points[0], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[1], Is.SameAs(curve1.HeadPoint));
+        Assert.That(points[2], Is.SameAs(curve2.HeadPoint));
     }
 
     [Test]
@@ -618,10 +618,10 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(3, points.Count);
-        Assert.AreSame(curve1.EndPoint, points[0]);
-        Assert.AreSame(curve1.HeadPoint, points[1]);
-        Assert.AreSame(curve2.EndPoint, points[2]);
+        Assert.That(points.Count, Is.EqualTo(3));
+        Assert.That(points[0], Is.SameAs(curve1.EndPoint));
+        Assert.That(points[1], Is.SameAs(curve1.HeadPoint));
+        Assert.That(points[2], Is.SameAs(curve2.EndPoint));
     }
 
     [Test]
@@ -636,9 +636,9 @@
         List<Point2D> points = loop.CalcPoints;
 
         // assert
-        Assert.AreEqual(2, points.Count);
-        Assert.AreSame(curve.HeadPoint, points[0]);
-        Assert.AreSame(curve.EndPoint, points[1]);
+        Assert.That(points.Count, Is.EqualTo(2));
+        Assert.That(points[0], Is.SameAs(curve.HeadPoint));
+        Assert.That(points[1], Is.SameAs(curve.EndPoint));
     }
 
     [Test]