Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs
===================================================================
diff -u -r4900 -r4901
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs	(.../GeometryDataTests.cs)	(revision 4900)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs	(.../GeometryDataTests.cs)	(revision 4901)
@@ -159,9 +159,12 @@
         Point2D point = geometryModel.GetPointAtLocation(new Point2D(x, z), tolerance);
         if (isPresent)
         {
-            Assert.That(point, Is.Not.Null);
-            Assert.That(point.X, Is.EqualTo(x).Within(tolerance));
-            Assert.That(point.Z, Is.EqualTo(z).Within(tolerance));
+            Assert.Multiple(() =>
+            {
+                Assert.That(point, Is.Not.Null);
+                Assert.That(point.X, Is.EqualTo(x).Within(tolerance));
+                Assert.That(point.Z, Is.EqualTo(z).Within(tolerance));
+            });
         }
         else
         {
@@ -199,11 +202,14 @@
         });
         var curveList = new List<GeometryCurve>();
         geometryModel.GetCurvesCoincidingWithPoint(new Point2D(x, z), ref curveList);
-        Assert.That(curveList.Count, Is.EqualTo(curveCount));
-        if (curveCount > 0 && curve1 >= 0)
+        Assert.Multiple(() =>
         {
-            Assert.That(curveList[0].Equals(geometryModel.Curves[curve1]), Is.True);
-        }
+            Assert.That(curveList.Count, Is.EqualTo(curveCount));
+            if (curveCount > 0 && curve1 >= 0)
+            {
+                Assert.That(curveList[0].Equals(geometryModel.Curves[curve1]), Is.True);
+            }
+        });
     }
 
     private GeometryData CreateGeometrySurface()