Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs
===================================================================
diff -u -r6253 -r6404
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs	(.../GeometryCurveTests.cs)	(revision 6253)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs	(.../GeometryCurveTests.cs)	(revision 6404)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2024. All rights reserved.
+// Copyright (C) Stichting Deltares 2025. All rights reserved.
 // 
 // This file is part of the Dam Engine.
 // 
@@ -39,7 +39,7 @@
         var curve = new GeometryCurve(headPointNotSet ? null : point,
                                       endPointNotSet ? null : point);
         Assert.That((curve.HeadPoint == null || curve.EndPoint == null), Is.EqualTo(true),
-                      "Test boundary case.");
+                    "Test boundary case.");
 
         // call
         bool containsPoint = curve.ContainsPoint(new Point2D(point.X, point.Z), GeometryPoint.Precision);
@@ -52,8 +52,8 @@
     public void ContainsPoint_BothPointsSetAndPointIsNotOnLineInXZplane_ReturnFalse()
     {
         // setup
-        var curve = new GeometryCurve(new Point2D(0.0,  0.0),
-                                      new Point2D(10.0,  10.0));
+        var curve = new GeometryCurve(new Point2D(0.0, 0.0),
+                                      new Point2D(10.0, 10.0));
         var point = new Point2D(1.1, 6.7);
 
         // call
@@ -96,21 +96,20 @@
         bool reversedLocationEquals = baseCurve.LocationEquals(curve);
         Assert.Multiple(() =>
         {
-
             // assert
             Assert.That(locationEquals, Is.EqualTo(expected));
             Assert.That(reversedLocationEquals, Is.EqualTo(expected));
         });
-    }   
-    
+    }
+
     [Test]
     public void AssignSurfacesFromCurve_WorksAsExpected()
     {
         // setup
         var curve = new GeometryCurve(new Point2D(0.0, 0.0),
                                       new Point2D(10.0, 10.0));
         var curveEmptySurface = new GeometryCurve(new Point2D(0.0, 0.0),
-                                      new Point2D(10.0, 10.0));
+                                                  new Point2D(10.0, 10.0));
         var surfaceRight = new GeometrySurface
         {
             Name = "SurfaceRight"
@@ -121,7 +120,7 @@
         };
         curve.SurfaceAtLeft = surfaceLeft;
         curve.SurfaceAtRight = surfaceRight;
-        
+
         // call
         curveEmptySurface.AssignSurfacesFromCurve(curve);
         curve.AssignSurfacesFromCurve(curveEmptySurface);
@@ -138,9 +137,45 @@
 
     public class GivenGeometryCurve
     {
-        private static readonly GeometryCurve geometryCurve = CreateGeometryCurve(); 
-        private static readonly List<Point2D> points = ClonedPoints(geometryCurve); 
+        private static readonly GeometryCurve geometryCurve = CreateGeometryCurve();
+        private static readonly List<Point2D> points = ClonedPoints(geometryCurve);
 
+        private static List<Point2D> ClonedPoints(GeometryCurve curve)
+        {
+            var points = new List<Point2D>
+            {
+                curve.HeadPoint.Clone(),
+                curve.EndPoint.Clone()
+            };
+            return points;
+        }
+
+        private static GeometryCurve CreateGeometryCurve()
+        {
+            GeometryLoop loopLeft = CreateLoop(0.0);
+            GeometryLoop loopRight = CreateLoop(10.0);
+            loopRight.CurveList.Add(new GeometryCurve(new Point2D(10.1, 10.2), new Point2D(10.3, 10.4)));
+            var curve = new GeometryCurve(new Point2D(1.0, 2.0), new Point2D(10.0, 20.0))
+            {
+                SurfaceAtLeft = new GeometrySurface(loopLeft),
+                SurfaceAtRight = new GeometrySurface(loopRight),
+                Name = "Geometry Curve 1"
+            };
+            return curve;
+        }
+
+        private static GeometryLoop CreateLoop(double x)
+        {
+            var loop = new GeometryLoop();
+            var point1 = new Point2D(0.0 + x, 0.2);
+            var point2 = new Point2D(1.0 + x, 0.2);
+            var point3 = new Point2D(1.0 + x, 0.4);
+            loop.CurveList.Add(new GeometryCurve(point1, point2));
+            loop.CurveList.Add(new GeometryCurve(point2, point3));
+            loop.CurveList.Add(new GeometryCurve(point3, point1));
+            return loop;
+        }
+
         [TestFixture]
         public class WhenCloned : GivenGeometryCurve
         {
@@ -167,13 +202,14 @@
         [TestFixture]
         public class WithoutSurfacesWhenCloned : GivenGeometryCurve
         {
+            private static readonly GeometryCurve clonedGeometryCurve = geometryCurve.Clone(points);
+
             [SetUp]
             public void Setup()
             {
                 geometryCurve.SurfaceAtLeft = null;
                 geometryCurve.SurfaceAtRight = null;
             }
-            private static readonly GeometryCurve clonedGeometryCurve = geometryCurve.Clone(points);
 
             [Test]
             public void ThenCopyOfCurveIsReturned_WithoutExceptions()
@@ -190,42 +226,5 @@
                 });
             }
         }
-
-        private static List<Point2D> ClonedPoints(GeometryCurve curve)
-        {
-            var points = new List<Point2D>
-            {
-                curve.HeadPoint.Clone(),
-                curve.EndPoint.Clone()
-            };
-            return points;
-        }
-
-        private static GeometryCurve CreateGeometryCurve()
-        {
-            GeometryLoop loopLeft = CreateLoop(0.0);
-            GeometryLoop loopRight = CreateLoop(10.0);
-            loopRight.CurveList.Add(new GeometryCurve(new Point2D(10.1, 10.2), new Point2D(10.3, 10.4)));
-            var curve = new GeometryCurve(new Point2D(1.0, 2.0), new Point2D(10.0, 20.0))
-            {
-                SurfaceAtLeft = new GeometrySurface(loopLeft),
-                SurfaceAtRight = new GeometrySurface(loopRight),
-                Name = "Geometry Curve 1"
-            };
-            return curve;
-        }
-        
-        private static GeometryLoop CreateLoop(double x)
-        {
-            var loop = new GeometryLoop();
-            var point1 = new Point2D(0.0 + x, 0.2);
-            var point2 = new Point2D(1.0 + x, 0.2);
-            var point3 = new Point2D(1.0 + x, 0.4);
-            loop.CurveList.Add(new GeometryCurve(point1, point2));
-            loop.CurveList.Add(new GeometryCurve(point2, point3));
-            loop.CurveList.Add(new GeometryCurve(point3, point1));
-            return loop;
-        }
-        
     }
 }
\ No newline at end of file