Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs
===================================================================
diff -u -r4899 -r4901
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs	(.../GeometryHelperTests.cs)	(revision 4899)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs	(.../GeometryHelperTests.cs)	(revision 4901)
@@ -23,7 +23,6 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.TestHelpers.Factories;
-using Deltares.DamEngine.TestHelpers.Geometry;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Data.Tests.Geotechnics;
@@ -56,11 +55,14 @@
 
         // Then
         GeometryBounds geometryBounds = soilProfile2D.Geometry.GetGeometryBounds();
-        Assert.That(geometryBounds.Left, Is.EqualTo(-2).Within(cTolerance));
-        Assert.That(soilProfile2D.Geometry.Left, Is.EqualTo(-2).Within(cTolerance));
-        // At first there are 3 surfaces, but after extending the right boundary, there are 6 surfaces
-        Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(6));
-        // TOOD: MWDAM-2132 still 3 loose lines
+        Assert.Multiple(() =>
+        {
+            Assert.That(geometryBounds.Left, Is.EqualTo(-2).Within(cTolerance));
+            Assert.That(soilProfile2D.Geometry.Left, Is.EqualTo(-2).Within(cTolerance));
+            // At first there are 3 surfaces, but after extending the right boundary, there are 6 surfaces
+            Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(6));
+            // TODO: MWDAM-2132 still 3 loose lines
+        });
     }
 
     [Test]
@@ -86,9 +88,12 @@
         // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json");
 
         // Then
-        Assert.That(soilProfile2D.Geometry.Right, Is.EqualTo(12).Within(cTolerance));
-        // At first there are 3 surfaces, but after extending the right boundary, there are 6 surfaces
-        Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(6));
+        Assert.Multiple(() =>
+        {
+            Assert.That(soilProfile2D.Geometry.Right, Is.EqualTo(12).Within(cTolerance));
+            // At first there are 3 surfaces, but after extending the right boundary, there are 6 surfaces
+            Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(6));
+        });
     }
 
     [Test]
@@ -118,9 +123,12 @@
 
         // Then
         GeometryBounds geometryBounds = soilProfile2D.Geometry.GetGeometryBounds();
-        Assert.That(geometryBounds.Left, Is.EqualTo(2).Within(cTolerance));
-        Assert.That(soilProfile2D.Geometry.Left, Is.EqualTo(2).Within(cTolerance));
-        Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(3));
+        Assert.Multiple(() =>
+        {
+            Assert.That(geometryBounds.Left, Is.EqualTo(2).Within(cTolerance));
+            Assert.That(soilProfile2D.Geometry.Left, Is.EqualTo(2).Within(cTolerance));
+            Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(3));
+        });
     }
 
     [Test, Ignore("Work in progress")]
@@ -140,8 +148,11 @@
 
         // Then
         GeometryBounds geometryBounds = soilProfile2D.Geometry.GetGeometryBounds();
-        Assert.That(geometryBounds.Right, Is.EqualTo(8).Within(cTolerance));
-        Assert.That(soilProfile2D.Geometry.Right, Is.EqualTo(8).Within(cTolerance));
-        Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(3));
+        Assert.Multiple(() =>
+        {
+            Assert.That(geometryBounds.Right, Is.EqualTo(8).Within(cTolerance));
+            Assert.That(soilProfile2D.Geometry.Right, Is.EqualTo(8).Within(cTolerance));
+            Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(3));
+        });
     }
 }
\ No newline at end of file
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()