Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs	(.../GeometryDataTests.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs	(.../GeometryDataTests.cs)	(revision 4000)
@@ -28,7 +28,6 @@
     [TestFixture]
     public class GeometryDataTests
     {
-
         [Test]
         public void TestRemoveDoublesFromNewlyEffectedPointsAndCurves()
         {
@@ -80,8 +79,8 @@
         [Test]
         public void GeometryHelperTestSurfaceTwoVertLayers()
         {
-            var gData = CreateGeometrySurface2();
-            var line = gData.SurfaceLine;
+            GeometryData gData = CreateGeometrySurface2();
+            GeometryPointString line = gData.SurfaceLine;
             Assert.AreEqual(3, line.Points.Count);
             Assert.AreEqual(1.0, line.Points.OrderBy(p => p.X).First().X);
             Assert.AreEqual(10.0, line.Points.OrderByDescending(p => p.X).First().X);
@@ -90,8 +89,8 @@
         [Test]
         public void GeometryDataTestSurfaceTwoHorLayers()
         {
-            var gData = CreateGeometrySurface();
-            var line = gData.SurfaceLine;
+            GeometryData gData = CreateGeometrySurface();
+            GeometryPointString line = gData.SurfaceLine;
             Assert.AreEqual(2, line.CalcPoints.Count);
             Assert.AreEqual(1.0, line.CalcPoints.OrderBy(p => p.X).First().X);
             Assert.AreEqual(10.0, line.CalcPoints.OrderByDescending(p => p.X).First().X);
@@ -161,13 +160,22 @@
             var curve5 = new GeometryCurve(point5, point6);
 
             geometryModel.Points.AddRange(new[]
-                {
-                    point1, point2, point3, point4, point5, point6
-                });
+            {
+                point1,
+                point2,
+                point3,
+                point4,
+                point5,
+                point6
+            });
             geometryModel.Curves.AddRange(new[]
-                {
-                    curve1, curve2, curve3, curve4, curve5
-                });
+            {
+                curve1,
+                curve2,
+                curve3,
+                curve4,
+                curve5
+            });
 
             geometryModel.NewlyEffectedPoints.AddRange(geometryModel.Points);
             geometryModel.NewlyEffectedCurves.AddRange(geometryModel.Curves);
@@ -205,13 +213,25 @@
             var curve7 = new GeometryCurve(point6, point4);
 
             geometryModel.Points.AddRange(new[]
-                {
-                    point1, point2, point3, point4, point5, point6
-                });
+            {
+                point1,
+                point2,
+                point3,
+                point4,
+                point5,
+                point6
+            });
             geometryModel.Curves.AddRange(new[]
-                {
-                    curve1, curve2, curve3, curve4, curve5, curve5, curve6, curve7
-                });
+            {
+                curve1,
+                curve2,
+                curve3,
+                curve4,
+                curve5,
+                curve5,
+                curve6,
+                curve7
+            });
 
             geometryModel.NewlyEffectedPoints.AddRange(geometryModel.Points);
             geometryModel.NewlyEffectedCurves.AddRange(geometryModel.Curves);
@@ -258,19 +278,33 @@
             var curve8 = new GeometryCurve(point8, point5);
 
             geometryModel.Points.AddRange(new[]
-                {
-                    point1, point2, point3, point4, point5, point6, point7, point8
-                });
+            {
+                point1,
+                point2,
+                point3,
+                point4,
+                point5,
+                point6,
+                point7,
+                point8
+            });
             geometryModel.Curves.AddRange(new[]
-                {
-                    curve1, curve2, curve3, curve4, curve5, curve5, curve6, curve7, curve8
-                });
+            {
+                curve1,
+                curve2,
+                curve3,
+                curve4,
+                curve5,
+                curve5,
+                curve6,
+                curve7,
+                curve8
+            });
 
             geometryModel.NewlyEffectedPoints.AddRange(geometryModel.Points);
             geometryModel.NewlyEffectedCurves.AddRange(geometryModel.Curves);
             geometryModel.RegenerateGeometry();
             return geometryModel;
         }
-
     }
-}
+}
\ No newline at end of file