Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r4753 -r4755
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 4753)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 4755)
@@ -133,47 +133,62 @@
                                                                                 out List<LogMessage> _);
 
         // Check Dike
-        Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1));
+        Assert.That(waterBoard.Dikes, Has.Count.EqualTo(1));
         Dike dike = waterBoard.Dikes[0];
 
         //Check locations
-        Assert.That(dike.Locations.Count, Is.EqualTo(2));
+        Assert.That(dike.Locations, Has.Count.EqualTo(2));
 
         // Check Soilprofiles
-        Assert.That(dike.SoilProfiles.Count, Is.EqualTo(23));
+        Assert.That(dike.SoilProfiles, Has.Count.EqualTo(23));
         SoilProfile1D soilProfile = dike.SoilProfiles.First(x => x.Name.Equals("25_2_1_bz_4"));
         Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo("kade"));
 
         //Check Soils
-        Assert.That(dike.SoilList.Soils.Count, Is.EqualTo(51));
+        Assert.That(dike.SoilList.Soils, Has.Count.EqualTo(51));
         Soil soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("kade")];
         Assert.That(soil.AbovePhreaticLevel, Is.EqualTo(17.0).Within(cTolerance));
         //Check Soil of shear strength model SigmaTauTable with sigma-tau table
         soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("CCC")];
-        Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable));
-        Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei"));
-        Assert.That(soil.StressTable.SigmaTaus.Count, Is.EqualTo(5));
-        Assert.That(soil.StressTable.SigmaTaus[0].Sigma, Is.EqualTo(0.0).Within(cTolerance));
-        Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(2.05).Within(cTolerance));
-        Assert.That(soil.StressTable.SigmaTaus[4].Sigma, Is.EqualTo(110.5).Within(cTolerance));
-        Assert.That(soil.StressTable.SigmaTaus[4].Tau, Is.EqualTo(44.6).Within(cTolerance));
+        Assert.Multiple(() =>
+        {
+            Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable));
+            Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei"));
+            Assert.That(soil.StressTable.SigmaTaus, Has.Count.EqualTo(5));
+        });
+        Assert.Multiple(() =>
+        {
+            Assert.That(soil.StressTable.SigmaTaus[0].Sigma, Is.EqualTo(0.0).Within(cTolerance));
+            Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(2.05).Within(cTolerance));
+            Assert.That(soil.StressTable.SigmaTaus[4].Sigma, Is.EqualTo(110.5).Within(cTolerance));
+            Assert.That(soil.StressTable.SigmaTaus[4].Tau, Is.EqualTo(44.6).Within(cTolerance));
+        });
         //Check Soil of shear strength model MohrCoulomb with sigma-tau table
         soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("BSS")];
-        Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi));
-        Assert.That(soil.StressTable.Name, Is.EqualTo("CurveZand"));
-        Assert.That(soil.StressTable.SigmaTaus.Count, Is.EqualTo(2));
-        Assert.That(soil.StressTable.SigmaTaus[0].Sigma, Is.EqualTo(0.0).Within(cTolerance));
-        Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(0.0).Within(cTolerance));
-        Assert.That(soil.StressTable.SigmaTaus[1].Sigma, Is.EqualTo(200.0).Within(cTolerance));
-        Assert.That(soil.StressTable.SigmaTaus[1].Tau, Is.EqualTo(129.88).Within(cTolerance));
+        Assert.Multiple(() =>
+        {
+            Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi));
+            Assert.That(soil.StressTable.Name, Is.EqualTo("CurveZand"));
+            Assert.That(soil.StressTable.SigmaTaus, Has.Count.EqualTo(2));
+        });
+        Assert.Multiple(() =>
+        {
+            Assert.That(soil.StressTable.SigmaTaus[0].Sigma, Is.EqualTo(0.0).Within(cTolerance));
+            Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(0.0).Within(cTolerance));
+            Assert.That(soil.StressTable.SigmaTaus[1].Sigma, Is.EqualTo(200.0).Within(cTolerance));
+            Assert.That(soil.StressTable.SigmaTaus[1].Tau, Is.EqualTo(129.88).Within(cTolerance));
+        });
 
         // Check Segments
-        Assert.That(waterBoard.Segments.Count, Is.EqualTo(2));
+        Assert.That(waterBoard.Segments, Has.Count.EqualTo(2));
         Segment segment = waterBoard.Segments.First(x => x.Name.Equals("106"));
-        Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("25_2_1_bz_1"));
-        Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(35.0).Within(cTolerance));
-        Assert.That(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType
-                             .Equals(FailureMechanismSystemType.StabilityInside), Is.True);
+        Assert.Multiple(() =>
+        {
+            Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("25_2_1_bz_1"));
+            Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(35.0).Within(cTolerance));
+            Assert.That(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType, 
+                        Is.EqualTo(FailureMechanismSystemType.StabilityInside));
+        });
     }
 
     [Test]