Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r5354 -r6086
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 5354)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs	(.../FillXmlOutputFromDamTests.cs)	(revision 6086)
@@ -155,49 +155,37 @@
             var p1 = new CharacteristicPoint
             {
                 CharacteristicPointType = CharacteristicPointType.SurfaceLevelOutside,
-                GeometryPoint = new GeometryPoint(),
-                X = 0,
-                Z = 0
+                Point = new Point2D(0, 0)
             };
             surfaceline.CharacteristicPoints.Add(p1);
             var p2 = new CharacteristicPoint
             {
                 CharacteristicPointType = CharacteristicPointType.DikeToeAtRiver,
-                GeometryPoint = new GeometryPoint(),
-                X = 10,
-                Z = 0
+                Point = new Point2D(10, 0)
             };
             surfaceline.CharacteristicPoints.Add(p2);
             var p3 = new CharacteristicPoint
             {
                 CharacteristicPointType = CharacteristicPointType.DikeTopAtRiver,
-                GeometryPoint = new GeometryPoint(),
-                X = 15,
-                Z = 2
+                Point = new Point2D(15, 2)
             };
             surfaceline.CharacteristicPoints.Add(p3);
             var p4 = new CharacteristicPoint
             {
                 CharacteristicPointType = CharacteristicPointType.DikeTopAtPolder,
-                GeometryPoint = new GeometryPoint(),
-                X = 18,
-                Z = 2
+                Point = new Point2D(18, 2)
             };
             surfaceline.CharacteristicPoints.Add(p4);
             var p5 = new CharacteristicPoint
             {
                 CharacteristicPointType = CharacteristicPointType.DikeToeAtPolder,
-                GeometryPoint = new GeometryPoint(),
-                X = 23,
-                Z = 0
+                Point = new Point2D(23, 0)
             };
             surfaceline.CharacteristicPoints.Add(p5);
             var p6 = new CharacteristicPoint
             {
                 CharacteristicPointType = CharacteristicPointType.SurfaceLevelInside,
-                GeometryPoint = new GeometryPoint(),
-                X = 100,
-                Z = 0
+                Point = new Point2D(100, 0)
             };
             surfaceline.CharacteristicPoints.Add(p6);
             result.PipingDesignResults.RedesignedSurfaceLine = surfaceline;
@@ -387,44 +375,33 @@
         surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint
         {
             CharacteristicPointType = CharacteristicPointType.SurfaceLevelOutside,
-            GeometryPoint = new GeometryPoint(),
-            X = random.NextDouble(),
-            Z = random.NextDouble()
+            Point = new Point2D(random.NextDouble(), random.NextDouble())
         });
         surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint
         {
             CharacteristicPointType = CharacteristicPointType.DikeToeAtRiver,
-            GeometryPoint = new GeometryPoint(),
-            X = random.NextDouble(),
-            Z = random.NextDouble()
+            Point = new Point2D(random.NextDouble(), random.NextDouble())
         });
         surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint
         {
             CharacteristicPointType = CharacteristicPointType.DikeTopAtRiver,
-            GeometryPoint = new GeometryPoint(),
-            X = random.NextDouble(),
-            Z = random.NextDouble()
+            Point = new Point2D(random.NextDouble(), random.NextDouble())
         });
         surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint
         {
             CharacteristicPointType = CharacteristicPointType.DikeTopAtPolder,
-            GeometryPoint = new GeometryPoint(),
-            X = random.NextDouble(),
-            Z = random.NextDouble()
+            Point = new Point2D(random.NextDouble(), random.NextDouble()),
+            
         });
         surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint
         {
             CharacteristicPointType = CharacteristicPointType.DikeToeAtPolder,
-            GeometryPoint = new GeometryPoint(),
-            X = random.NextDouble(),
-            Z = random.NextDouble()
+            Point = new Point2D(random.NextDouble(), random.NextDouble())
         });
         surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint
         {
             CharacteristicPointType = CharacteristicPointType.SurfaceLevelInside,
-            GeometryPoint = new GeometryPoint(),
-            X = random.NextDouble(),
-            Z = random.NextDouble()
+            Point = new Point2D(random.NextDouble(), random.NextDouble())
         });
 
         return surfaceLine;
@@ -513,8 +490,8 @@
 
     private static void AssertCharacteristicPoint(CharacteristicPoint expected, SurfaceLinePoint actual)
     {
-        Assert.That(actual.X, Is.EqualTo(expected.X));
-        Assert.That(actual.Z, Is.EqualTo(expected.Z));
+        Assert.That(actual.X, Is.EqualTo(expected.Point.X));
+        Assert.That(actual.Z, Is.EqualTo(expected.Point.Z));
         Assert.That(actual.PointType,
                     Is.EqualTo(ConversionHelper.ConvertToInputPointType(expected.CharacteristicPointType)));
     }