Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometrySurfaceTests.cs
===================================================================
diff -u -r6560 -r6566
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometrySurfaceTests.cs	(.../GeometrySurfaceTests.cs)	(revision 6560)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometrySurfaceTests.cs	(.../GeometrySurfaceTests.cs)	(revision 6566)
@@ -33,16 +33,19 @@
     {
         GeometryData geometry = CreateDonutGeometry();
         Point2D testPoint = geometry.Surfaces[0].DetermineValidTestPointBasedOnNewSurface();
+        GeometryLoop outerLoop = geometry.Surfaces[0].OuterLoop;
+        GeometryLoop innerLoop = geometry.Surfaces[0].InnerLoops[0];
         Assert.Multiple(() =>
         {
-            Assert.That(testPoint.X, Is.EqualTo(5).Within(cTolerance));
-            Assert.That(testPoint.Z, Is.EqualTo(9.998).Within(cTolerance));
+            Assert.That(Routines2D.CheckIfPointIsInPolygon(outerLoop, testPoint.X, testPoint.Z) == PointInPolygon.InsidePolygon);
+            Assert.That(Routines2D.CheckIfPointIsInPolygon(innerLoop, testPoint.X, testPoint.Z) == PointInPolygon.OutsidePolygon);
         });
         testPoint = geometry.Surfaces[1].DetermineValidTestPointBasedOnNewSurface();
+        outerLoop = geometry.Surfaces[1].OuterLoop;
         Assert.Multiple(() =>
         {
-            Assert.That(testPoint.X, Is.EqualTo(5).Within(cTolerance));
-            Assert.That(testPoint.Z, Is.EqualTo(6.998).Within(cTolerance));
+            Assert.That(Routines2D.CheckIfPointIsInPolygon(outerLoop, testPoint.X, testPoint.Z) == PointInPolygon.InsidePolygon);
+            Assert.That(geometry.Surfaces[1].InnerLoops.Count, Is.EqualTo(0));
         });
     }
     
@@ -51,10 +54,11 @@
     {
         GeometryData geometry = CreatePointedGeometry();
         Point2D testPoint = geometry.Surfaces[0].DetermineValidTestPointBasedOnNewSurface();
+        GeometryLoop outerLoop = geometry.Surfaces[0].OuterLoop;
         Assert.Multiple(() =>
         {
-            Assert.That(testPoint.X, Is.EqualTo(5.000000).Within(cTolerance));
-            Assert.That(testPoint.Z, Is.EqualTo(9.999500).Within(cTolerance));
+            Assert.That(Routines2D.CheckIfPointIsInPolygon(outerLoop, testPoint.X, testPoint.Z) == PointInPolygon.InsidePolygon);
+            Assert.That(geometry.Surfaces[0].InnerLoops.Count, Is.EqualTo(0));
         });
     }