Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs	(.../SegmentTests.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs	(.../SegmentTests.cs)	(revision 4624)
@@ -32,48 +32,48 @@
     public void CanGetMostProbableProbableProfile1DForStability()
     {
         Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D);
-        Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name);
-        Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name);
-        Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping));
+        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));
     }
 
     [Test]
     public void CanGetMostProbableProbableProfile1DForPiping()
     {
         Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D);
-        Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name);
-        Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name);
-        Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability));
+        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));
     }
 
     [Test]
     public void CanGetMostProbableProbableProfile2DStiFileNameForStability()
     {
         Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile);
-        Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName);
-        Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping));
+        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));
     }
 
     [Test]
     public void CanGetMostProbableProbableProfile2DStiFileNameForPiping()
     {
         Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile);
-        Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName);
-        Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping));
-        Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability));
-        Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability));
+        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));
     }
 
     private static Segment CreateSegment(SegmentFailureMechanismType segmentFailureMechanismType, SoilProfileType soilProfileType)