Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs
===================================================================
diff -u -r4624 -r5960
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs	(.../SegmentTests.cs)	(revision 4624)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs	(.../SegmentTests.cs)	(revision 5960)
@@ -29,51 +29,47 @@
 public class SegmentTests
 {
     [Test]
-    public void CanGetMostProbableProbableProfile1DForStability()
+    public void CanGetMostProbableSoilGeometryProbability1DForStability()
     {
         Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D);
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name, Is.EqualTo("profile 1D 2"));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name, Is.EqualTo("profile 1D 2"));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
+        Assert.Multiple(() =>
+        {
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name, Is.EqualTo("profile 1D 2"));
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
+        });
     }
 
     [Test]
-    public void CanGetMostProbableProbableProfile1DForPiping()
+    public void CanGetMostProbableSoilGeometryProbability1DForPiping()
     {
         Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D);
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name, Is.EqualTo("profile 1D 2"));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name, Is.EqualTo("profile 1D 2"));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
+        Assert.Multiple(() =>
+        {
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name, Is.EqualTo("profile 1D 2"));
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
+        });
     }
 
     [Test]
-    public void CanGetMostProbableProbableProfile2DStiFileNameForStability()
+    public void CanGetMostProbableSoilGeometryProbability2DForStability()
     {
-        Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile);
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName, Is.EqualTo("sti filename 2"));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo("sti filename 2"));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
+        Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType2D);
+        Assert.Multiple(() =>
+        {
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile2D.Name, Is.EqualTo("profile 2D 2"));
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
+        });
     }
 
     [Test]
-    public void CanGetMostProbableProbableProfile2DStiFileNameForPiping()
+    public void CanGetMostProbableSoilGeometryProbability2DForPiping()
     {
-        Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile);
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName, Is.EqualTo("sti filename 2"));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping), Is.EqualTo("sti filename 2"));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
-        Assert.That(segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
+        Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType2D);
+        Assert.Multiple(() =>
+        {
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile2D.Name, Is.EqualTo("profile 2D 2"));
+            Assert.That(segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability), Is.EqualTo(null));
+        });
     }
 
     private static Segment CreateSegment(SegmentFailureMechanismType segmentFailureMechanismType, SoilProfileType soilProfileType)
@@ -84,7 +80,10 @@
             Probability = 0.1,
             SegmentFailureMechanismType = segmentFailureMechanismType,
             SoilProfileType = soilProfileType,
-            FullStiFileName = "sti filename 1",
+            SoilProfile2D = new SoilProfile2D
+            {
+                Name = "profile 2D 1"
+            },
             SoilProfile1D = new SoilProfile1D
             {
                 Name = "profile 1D 1"
@@ -95,7 +94,10 @@
             Probability = 0.4,
             SegmentFailureMechanismType = segmentFailureMechanismType,
             SoilProfileType = soilProfileType,
-            FullStiFileName = "sti filename 2",
+            SoilProfile2D = new SoilProfile2D
+            {
+                Name = "profile 2D 2"
+            },
             SoilProfile1D = new SoilProfile1D
             {
                 Name = "profile 1D 2"
@@ -106,7 +108,10 @@
             Probability = 0.3,
             SegmentFailureMechanismType = segmentFailureMechanismType,
             SoilProfileType = soilProfileType,
-            FullStiFileName = "sti filename 3",
+            SoilProfile2D = new SoilProfile2D
+            {
+                Name = "profile 2D 3"
+            },
             SoilProfile1D = new SoilProfile1D
             {
                 Name = "profile 1D 3"
@@ -117,7 +122,10 @@
             Probability = 0.2,
             SegmentFailureMechanismType = segmentFailureMechanismType,
             SoilProfileType = soilProfileType,
-            FullStiFileName = "sti filename 4",
+            SoilProfile2D = new SoilProfile2D
+            {
+                Name = "profile 2D 4"
+            },
             SoilProfile1D = new SoilProfile1D
             {
                 Name = "profile 1D 4"