Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs
===================================================================
diff -u -r5080 -r5192
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs	(.../GeometryCurveTests.cs)	(revision 5080)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryCurveTests.cs	(.../GeometryCurveTests.cs)	(revision 5192)
@@ -38,14 +38,14 @@
         var point = new Point2D();
         var curve = new GeometryCurve(headPointNotSet ? null : point,
                                       endPointNotSet ? null : point);
-        Assert.That((curve.HeadPoint == null || curve.EndPoint == null).Equals(true),
+        Assert.That((curve.HeadPoint == null || curve.EndPoint == null), Is.EqualTo(true),
                       "Test boundary case.");
 
         // call
-        var containsPoint = curve.ContainsPoint(new Point2D(point.X, point.Z), GeometryPoint.Precision);
+        bool containsPoint = curve.ContainsPoint(new Point2D(point.X, point.Z), GeometryPoint.Precision);
 
         // assert
-        Assert.That(containsPoint.Equals(false));
+        Assert.That(containsPoint, Is.EqualTo(false));
     }
 
     [Test]
@@ -57,10 +57,10 @@
         var point = new Point2D(1.1, 6.7);
 
         // call
-        var containsPoint = curve.ContainsPoint(point, GeometryPoint.Precision);
+        bool containsPoint = curve.ContainsPoint(point, GeometryPoint.Precision);
 
         // assert
-        Assert.That(containsPoint.Equals(false));
+        Assert.That(containsPoint, Is.EqualTo(false));
     }
 
     [Test]
@@ -72,10 +72,10 @@
         var point = new Point2D(3.0, 3.0);
 
         // call
-        var containsPoint = curve.ContainsPoint(point, GeometryPoint.Precision);
+        bool containsPoint = curve.ContainsPoint(point, GeometryPoint.Precision);
 
         // assert
-        Assert.That(containsPoint.Equals(true));
+        Assert.That(containsPoint, Is.EqualTo(true));
     }
 
     [Test]
@@ -91,13 +91,16 @@
         var curve = new GeometryCurve(new Point2D(X1, Z1), new Point2D(X2, Z2));
 
         // call
-        var locationEquals = curve.LocationEquals(baseCurve);
+        bool locationEquals = curve.LocationEquals(baseCurve);
         curve.Reverse();
-        var reversedLocationEquals = baseCurve.LocationEquals(curve);
-        
-        // assert
-        Assert.That(locationEquals.Equals(expected));
-        Assert.That(reversedLocationEquals.Equals(expected));
+        bool reversedLocationEquals = baseCurve.LocationEquals(curve);
+        Assert.Multiple(() =>
+        {
+
+            // assert
+            Assert.That(locationEquals, Is.EqualTo(expected));
+            Assert.That(reversedLocationEquals, Is.EqualTo(expected));
+        });
     }   
     
     [Test]
@@ -108,10 +111,14 @@
                                       new Point2D(10.0, 10.0));
         var curveEmptySurface = new GeometryCurve(new Point2D(0.0, 0.0),
                                       new Point2D(10.0, 10.0));
-        var surfaceRight = new GeometrySurface();
-        surfaceRight.Name = "SurfaceRight";
-        var surfaceLeft = new GeometrySurface();
-        surfaceLeft.Name = "SurfaceLeft";
+        var surfaceRight = new GeometrySurface
+        {
+            Name = "SurfaceRight"
+        };
+        var surfaceLeft = new GeometrySurface
+        {
+            Name = "SurfaceLeft"
+        };
         curve.SurfaceAtLeft = surfaceLeft;
         curve.SurfaceAtRight = surfaceRight;
         
@@ -120,10 +127,12 @@
         curve.AssignSurfacesFromCurve(curveEmptySurface);
 
         // assert
-        Assert.That(curveEmptySurface.SurfaceAtLeft.Name.Equals("SurfaceLeft"));
-        Assert.That(curveEmptySurface.SurfaceAtRight.Name.Equals("SurfaceRight"));
-        Assert.That(curve.SurfaceAtLeft.Name.Equals("SurfaceLeft"));
-        Assert.That(curve.SurfaceAtRight.Name.Equals("SurfaceRight"));
+        {
+            Assert.That(curveEmptySurface.SurfaceAtLeft.Name.Equals("SurfaceLeft"));
+            Assert.That(curveEmptySurface.SurfaceAtRight.Name.Equals("SurfaceRight"));
+            Assert.That(curve.SurfaceAtLeft.Name.Equals("SurfaceLeft"));
+            Assert.That(curve.SurfaceAtRight.Name.Equals("SurfaceRight"));
+        });
     }
 
     public class GivenGeometryCurve
@@ -143,14 +152,14 @@
                 Assert.Multiple(() =>
                 {
                     Assert.That(clonedGeometryCurve.Name, Is.EqualTo(geometryCurve.Name));
+                    // points are copied
                     Assert.That(clonedGeometryCurve.LocationEquals(geometryCurve), Is.True);
                     Assert.That(clonedGeometryCurve.HeadPoint, Is.Not.EqualTo(geometryCurve.HeadPoint));
                     Assert.That(clonedGeometryCurve.EndPoint, Is.Not.EqualTo(geometryCurve.EndPoint));
+                    // surfaces are references
+                    Assert.That(clonedGeometryCurve.SurfaceAtLeft, Is.EqualTo(geometryCurve.SurfaceAtLeft));
+                    Assert.That(clonedGeometryCurve.SurfaceAtRight, Is.EqualTo(geometryCurve.SurfaceAtRight));
                 });
-                // Assert.That(clonedGeometryCurve.SurfaceAtLeft.OuterLoop.Count, Is.EqualTo(geometryCurve.SurfaceAtLeft.OuterLoop.Count));
-                // Assert.That(clonedGeometryCurve.SurfaceAtRight.OuterLoop.Count, Is.EqualTo(geometryCurve.SurfaceAtRight.OuterLoop.Count));
-                // Assert.That(clonedGeometryCurve.SurfaceAtLeft, Is.Not.EqualTo(geometryCurve.SurfaceAtLeft));
-                // Assert.That(clonedGeometryCurve.SurfaceAtRight, Is.Not.EqualTo(geometryCurve.SurfaceAtRight));
             }
         }
 
@@ -193,18 +202,29 @@
 
         private static GeometryCurve CreateGeometryCurve()
         {
-            // ToDo: Create a proper GeometryCurve with a SurfaceAtLeft and SurfaceAtRight
-            // var loopLeft = new GeometryLoop();
-            // loopLeft.CurveList.Add(new GeometryCurve(new Point2D(0.1, 0.2), new Point2D(0.3, 0.4)));
-            // var loopRight = new GeometryLoop();
-            // loopRight.CurveList.Add(new GeometryCurve(new Point2D(10.1, 10.2), new Point2D(10.3, 10.4)));
+            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),
+                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