Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/TestDataCreator.cs
===================================================================
diff -u -r1990 -r2002
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/TestDataCreator.cs	(.../TestDataCreator.cs)	(revision 1990)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/TestDataCreator.cs	(.../TestDataCreator.cs)	(revision 2002)
@@ -22,9 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Sensors;
@@ -37,8 +34,8 @@
 {
     public class TestDataCreator
     {
-        public const AnalysisType expectedAnalysisType = AnalysisType.AdaptGeometry;
-        public const AnalysisType notExpectedAnalysisType = AnalysisType.NoAdaption;
+        public const AnalysisType ExpectedAnalysisType = AnalysisType.AdaptGeometry;
+        public const AnalysisType NotExpectedAnalysisType = AnalysisType.NoAdaption;
 
         public static DamProjectData CreateExampleDamProjectData()
         {
@@ -209,7 +206,7 @@
         {
             damProjectData.DamProjectType = DamProjectType.Design;
             damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification();
-            DamProjectCalculationSpecification.SelectedAnalysisType = expectedAnalysisType;
+            DamProjectCalculationSpecification.SelectedAnalysisType = ExpectedAnalysisType;
             var calculationSpecification = new DamFailureMechanismeCalculationSpecification();
             calculationSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping;
             calculationSpecification.CalculationModel = PipingModelType.Bligh;
@@ -530,6 +527,30 @@
                     profile.PreconsolidationStresses.Add(preCon);
                 }
                 const int layerCount = 3;
+                var point1 = new Point2D(0, 0);
+                var point2 = new Point2D(0, 10);
+                var point3 = new Point2D(10, 10);
+                var point4 = new Point2D(1, 1);
+                var point5 = new Point2D(1, 9);
+                var point6 = new Point2D(9, 9);
+                profile.Geometry.Points.Add(point1);
+                profile.Geometry.Points.Add(point2);
+                profile.Geometry.Points.Add(point3);
+                profile.Geometry.Points.Add(point4);
+                profile.Geometry.Points.Add(point5);
+                profile.Geometry.Points.Add(point6);
+                var curve1 = new GeometryCurve() { HeadPoint = point1, EndPoint = point2 };
+                var curve2 = new GeometryCurve() { HeadPoint = point2, EndPoint = point3 };
+                var curve3 = new GeometryCurve() { HeadPoint = point3, EndPoint = point1 };
+                var curve4 = new GeometryCurve() { HeadPoint = point4, EndPoint = point5 };
+                var curve5 = new GeometryCurve() { HeadPoint = point5, EndPoint = point6 };
+                var curve6 = new GeometryCurve() { HeadPoint = point6, EndPoint = point4 };
+                profile.Geometry.Curves.Add(curve1);
+                profile.Geometry.Curves.Add(curve2);
+                profile.Geometry.Curves.Add(curve3);
+                profile.Geometry.Curves.Add(curve4);
+                profile.Geometry.Curves.Add(curve5);
+                profile.Geometry.Curves.Add(curve6);
                 for (int j = 0; j < layerCount; j++)
                 {
                     var layer = new SoilLayer2D
@@ -550,16 +571,25 @@
                     }
                     layer.GeometrySurface = new GeometrySurface();
                     var outerLoop = new GeometryLoop();
-                    outerLoop.Points.Add((new GeometryPoint(0, 0)));
-                    outerLoop.Points.Add((new GeometryPoint(0, 10)));
-                    outerLoop.Points.Add((new GeometryPoint(10, 10)));
+                    outerLoop.CalcPoints.Add(point1);
+                    outerLoop.CalcPoints.Add(point2);
+                    outerLoop.CalcPoints.Add(point3);
+                    outerLoop.CurveList.Add(curve1);
+                    outerLoop.CurveList.Add(curve2);
+                    outerLoop.CurveList.Add(curve3);
                     layer.GeometrySurface.OuterLoop = outerLoop;
+                    profile.Geometry.Loops.Add(outerLoop);
                     var innerloop = new GeometryLoop();
-                    innerloop.Points.Add((new GeometryPoint(1, 1)));
-                    innerloop.Points.Add((new GeometryPoint(1, 9)));
-                    innerloop.Points.Add((new GeometryPoint(9, 9)));
+                    innerloop.CalcPoints.Add(point4);
+                    innerloop.CalcPoints.Add(point5);
+                    innerloop.CalcPoints.Add(point6);
+                    innerloop.CurveList.Add(curve4);
+                    innerloop.CurveList.Add(curve5);
+                    innerloop.CurveList.Add(curve6);
                     layer.GeometrySurface.InnerLoops.Add(innerloop);
+                    profile.Geometry.Loops.Add(innerloop);
                     profile.Surfaces.Add(layer);
+                    profile.Geometry.Surfaces.Add(layer.GeometrySurface);
                 }
                 dike.SoilProfiles2D.Add(profile);
             }