Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs
===================================================================
diff -u -r4822 -r4823
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs	(.../SoilProfile2DDataModelTest.cs)	(revision 4822)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs	(.../SoilProfile2DDataModelTest.cs)	(revision 4823)
@@ -22,7 +22,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Components.Persistence.Stability.Version2.Data;
-using Deltares.Dam.StixFileReader.Tests.TestUtils;
 using Deltares.Geometry;
 using Deltares.Geotechnics.Soils;
 using NUnit.Framework;
@@ -58,70 +57,91 @@
         PersistableDataModel dataModel = PersistableDataModelFactory.CreateSimpleDataModelWithMultipleLayers();
 
         SoilProfile2D soilProfile2D = new SoilProfile2DDataModel().Create(dataModel);
-
-        Assert.That(soilProfile2D.Geometry.Points, Is.EqualTo(new List<GeometryPoint>
+        IList<GeometryPoint> points = soilProfile2D.Geometry.Points;
+        Assert.Multiple(() =>
         {
-            new(12, 0, -5),
-            new(12, 0, 5),
-            new(15, 0, 5),
-            new(15, 0, -5),
-            new(10, 0, -10),
-            new(10, 0, 10),
-            new(20, 0, 10),
-            new(20, 0, -10),
-            new(18, 0, 5),
-            new(18, 0, -5)
-        }).Using(new GeometryPointEqualityComparer()));
+            Assert.That(points.ElementAt(0).LocationEquals(new GeometryPoint(12, 0, -5)), Is.True);
+            Assert.That(points.ElementAt(1).LocationEquals(new GeometryPoint(12, 0, 5)), Is.True);
+            Assert.That(points.ElementAt(2).LocationEquals(new GeometryPoint(15, 0, 5)), Is.True);
+            Assert.That(points.ElementAt(3).LocationEquals(new GeometryPoint(15, 0, -5)), Is.True);
+            Assert.That(points.ElementAt(4).LocationEquals(new GeometryPoint(10, 0, -10)), Is.True);
+            Assert.That(points.ElementAt(5).LocationEquals(new GeometryPoint(10, 0, 10)), Is.True);
+            Assert.That(points.ElementAt(6).LocationEquals(new GeometryPoint(20, 0, 10)), Is.True);
+            Assert.That(points.ElementAt(7).LocationEquals(new GeometryPoint(20, 0, -10)), Is.True);
+            Assert.That(points.ElementAt(8).LocationEquals(new GeometryPoint(18, 0, 5)), Is.True);
+            Assert.That(points.ElementAt(9).LocationEquals(new GeometryPoint(18, 0, -5)), Is.True);
+        });
 
         Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(3));
-
-        GeometrySurface surface = soilProfile2D.Surfaces.ElementAt(0).GeometrySurface;
-        Assert.That(surface.OuterLoop.CurveList, Is.EqualTo(new List<GeometryCurve>
+        List<GeometryCurve> curves = soilProfile2D.Surfaces.ElementAt(0).GeometrySurface.OuterLoop.CurveList;
+        Assert.Multiple(() =>
         {
-            new(new GeometryPoint(12, 0, -5), new GeometryPoint(12, 0, 5)),
-            new(new GeometryPoint(12, 0, 5), new GeometryPoint(15, 0, 5)),
-            new(new GeometryPoint(15, 0, 5), new GeometryPoint(15, 0, -5)),
-            new(new GeometryPoint(15, 0, -5), new GeometryPoint(12, 0, -5))
-        }).Using(new GeometryCurveEqualityComparer()));
+            Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, -5), 
+                                                                             new GeometryPoint(12, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, 5), 
+                                                                             new GeometryPoint(15, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), 
+                                                                             new GeometryPoint(15, 0, -5))), Is.True);
+            Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, -5), 
+                                                                             new GeometryPoint(12, 0, -5))), Is.True);
+        });
 
-        surface = soilProfile2D.Surfaces.ElementAt(1).GeometrySurface;
-        Assert.That(surface.OuterLoop.CurveList, Is.EqualTo(new List<GeometryCurve>
+        curves = soilProfile2D.Surfaces.ElementAt(1).GeometrySurface.OuterLoop.CurveList;
+        Assert.Multiple(() =>
         {
-            new(new GeometryPoint(10, 0, -10), new GeometryPoint(10, 0, 10)),
-            new(new GeometryPoint(10, 0, 10), new GeometryPoint(20, 0, 10)),
-            new(new GeometryPoint(20, 0, 10), new GeometryPoint(20, 0, -10)),
-            new(new GeometryPoint(20, 0, -10), new GeometryPoint(10, 0, -10))
-        }).Using(new GeometryCurveEqualityComparer()));
+            Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, -10), 
+                                                                             new GeometryPoint(10, 0, 10))), Is.True);
+            Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, 10), 
+                                                                             new GeometryPoint(20, 0, 10))), Is.True);
+            Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, 10), 
+                                                                             new GeometryPoint(20, 0, -10))), Is.True);
+            Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, -10), 
+                                                                             new GeometryPoint(10, 0, -10))), Is.True);
+        });
 
-        surface = soilProfile2D.Surfaces.ElementAt(2).GeometrySurface;
-        Assert.That(surface.OuterLoop.CurveList, Is.EqualTo(new List<GeometryCurve>
+        curves = soilProfile2D.Surfaces.ElementAt(2).GeometrySurface.OuterLoop.CurveList;
+        Assert.Multiple(() =>
         {
-            new(new GeometryPoint(15, 0, 5), new GeometryPoint(18, 0, 5)),
-            new(new GeometryPoint(18, 0, 5), new GeometryPoint(18, 0, -5)),
-            new(new GeometryPoint(18, 0, -5), new GeometryPoint(15, 0, 5)),
-            new(new GeometryPoint(15, 0, 5), new GeometryPoint(15, 0, 5))
-        }).Using(new GeometryCurveEqualityComparer()));
+            Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), 
+                                                                             new GeometryPoint(18, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, 5), 
+                                                                             new GeometryPoint(18, 0, -5))), Is.True);
+            Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, -5), 
+                                                                             new GeometryPoint(15, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), 
+                                                                             new GeometryPoint(15, 0, 5))), Is.True);
+        });
 
-        Assert.That(soilProfile2D.Geometry.SurfaceLine.Points, Is.EqualTo(new List<GeometryPoint>
-        {
-            new(10, 0, 10),
-            new(20, 0, 10)
-        }).Using(new GeometryPointEqualityComparer()));
+        Assert.That(soilProfile2D.Geometry.SurfaceLine.Points.ElementAt(0).LocationEquals(new GeometryPoint(10, 0, 10)), Is.True);
+        Assert.That(soilProfile2D.Geometry.SurfaceLine.Points.ElementAt(1).LocationEquals(new GeometryPoint(20, 0, 10)), Is.True);
 
-        Assert.That(soilProfile2D.Geometry.Curves, Is.EqualTo(new List<GeometryCurve>
+        curves = soilProfile2D.Geometry.Curves;
+        Assert.Multiple(() =>
         {
-            new(new GeometryPoint(12, 0, -5), new GeometryPoint(12, 0, 5)),
-            new(new GeometryPoint(12, 0, 5), new GeometryPoint(15, 0, 5)),
-            new(new GeometryPoint(15, 0, 5), new GeometryPoint(15, 0, -5)),
-            new(new GeometryPoint(15, 0, -5), new GeometryPoint(12, 0, -5)),
-            new(new GeometryPoint(10, 0, -10), new GeometryPoint(10, 0, 10)),
-            new(new GeometryPoint(10, 0, 10), new GeometryPoint(20, 0, 10)),
-            new(new GeometryPoint(20, 0, 10), new GeometryPoint(20, 0, -10)),
-            new(new GeometryPoint(20, 0, -10), new GeometryPoint(10, 0, -10)),
-            new(new GeometryPoint(15, 0, 5), new GeometryPoint(18, 0, 5)),
-            new(new GeometryPoint(18, 0, 5), new GeometryPoint(18, 0, -5)),
-            new(new GeometryPoint(18, 0, -5), new GeometryPoint(15, 0, 5)),
-            new(new GeometryPoint(15, 0, 5), new GeometryPoint(15, 0, 5))
-        }).Using(new GeometryCurveEqualityComparer()));
+            Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, -5), 
+                                                                             new GeometryPoint(12, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, 5), 
+                                                                             new GeometryPoint(15, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), 
+                                                                             new GeometryPoint(15, 0, -5))), Is.True);
+            Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, -5), 
+                                                                             new GeometryPoint(12, 0, -5))), Is.True);
+            Assert.That(curves.ElementAt(4).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, -10), 
+                                                                             new GeometryPoint(10, 0, 10))), Is.True);
+            Assert.That(curves.ElementAt(5).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, 10), 
+                                                                             new GeometryPoint(20, 0, 10))), Is.True);
+            Assert.That(curves.ElementAt(6).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, 10), 
+                                                                             new GeometryPoint(20, 0, -10))), Is.True);
+            Assert.That(curves.ElementAt(7).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, -10), 
+                                                                             new GeometryPoint(10, 0, -10))), Is.True);
+            Assert.That(curves.ElementAt(8).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), 
+                                                                             new GeometryPoint(18, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(9).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, 5), 
+                                                                             new GeometryPoint(18, 0, -5))), Is.True);
+            Assert.That(curves.ElementAt(10).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, -5), 
+                                                                             new GeometryPoint(15, 0, 5))), Is.True);
+            Assert.That(curves.ElementAt(11).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), 
+                                                                             new GeometryPoint(15, 0, 5))), Is.True);
+        });
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/Deltares.Dam.StixFileReader.Tests.csproj
===================================================================
diff -u -r4803 -r4823
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/Deltares.Dam.StixFileReader.Tests.csproj	(.../Deltares.Dam.StixFileReader.Tests.csproj)	(revision 4803)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/Deltares.Dam.StixFileReader.Tests.csproj	(.../Deltares.Dam.StixFileReader.Tests.csproj)	(revision 4823)
@@ -13,6 +13,9 @@
         <Reference Include="Deltares.Geotechnics">
             <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
         </Reference>
+        <Reference Include="Deltares.Standard">
+          <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+        </Reference>
         <Reference Include="DGeoSuite.Common">
             <HintPath>..\..\..\lib\DamEngine\DGeoSuite.Common.dll</HintPath>
         </Reference>