Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs
===================================================================
diff -u -r4890 -r4891
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs	(.../LocationShapeFileImporterTest.cs)	(revision 4890)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs	(.../LocationShapeFileImporterTest.cs)	(revision 4891)
@@ -141,8 +141,11 @@
             Assert.That(importer.ImportedItems.Count(), Is.EqualTo(2));
 
             CsvImporterLocations.LocationRecord location2 = importer.ImportedItems.Single(l => l.LocationId == "loc3");
-            Assert.That(loc3.Geometry.Coordinate.X, Is.EqualTo(location2.GeoX));
-            Assert.That(loc3.Geometry.Coordinate.Y, Is.EqualTo(location2.GeoY));
+            Assert.Multiple(() =>
+            {
+                Assert.That(loc3.Geometry.Coordinate.X, Is.EqualTo(location2.GeoX));
+                Assert.That(loc3.Geometry.Coordinate.Y, Is.EqualTo(location2.GeoY));
+            });
         }
 
         #region Setup/Teardown
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs
===================================================================
diff -u -r4890 -r4891
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs	(.../LocationCharacteristicPointImporterTest.cs)	(revision 4890)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs	(.../LocationCharacteristicPointImporterTest.cs)	(revision 4891)
@@ -160,8 +160,11 @@
 
                 importer.Import();
 
-                Assert.That(location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).X, Is.EqualTo(0));
-                Assert.That(location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).Y, Is.EqualTo(0));
+                Assert.Multiple(() =>
+                {
+                    Assert.That(location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).X, Is.EqualTo(0));
+                    Assert.That(location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).Y, Is.EqualTo(0));
+                });
             }
         }
 
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs
===================================================================
diff -u -r4890 -r4891
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs	(.../LocationPropertyImporterTest.cs)	(revision 4890)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs	(.../LocationPropertyImporterTest.cs)	(revision 4891)
@@ -59,8 +59,11 @@
         [Test]
         public void IsPropertyAttribute_UsingLocationID_ReturnsFalse()
         {
-            Assert.That(LocationShapeFileAttributeMap.IsPropertyAttribute(LocationShapeFileAttributeMap.LocationAttributeId), Is.False);
-            Assert.That(LocationShapeFileAttributeMap.IsPropertyAttribute("Location_Id"), Is.False);
+            Assert.Multiple(() =>
+            {
+                Assert.That(LocationShapeFileAttributeMap.IsPropertyAttribute(LocationShapeFileAttributeMap.LocationAttributeId), Is.False);
+                Assert.That(LocationShapeFileAttributeMap.IsPropertyAttribute("Location_Id"), Is.False);
+            });
         }
 
         [Test]
@@ -231,61 +234,64 @@
 
             mockImporter.Import(null);
 
-            Assert.That(location.SegmentId, Is.EqualTo(stringTestValue));
-            Assert.That(location.DampingFactorPl3, Is.EqualTo(doubleTestValue));
-            Assert.That(location.DampingFactorPl4, Is.EqualTo(doubleTestValue));
-            Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo(stringTestValue));
-            Assert.That(location.DistanceToEntryPoint, Is.EqualTo(doubleTestValue));
-            Assert.That(location.HeadPl2, Is.EqualTo(doubleTestValue));
-            Assert.That(location.HeadPl3, Is.EqualTo(doubleTestValue));
-            Assert.That(location.HeadPl4, Is.EqualTo(doubleTestValue));
-            Assert.That(location.MinimalCircleDepth, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PenetrationLength, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PolderLevel, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PLLineCreationMethod, Is.EqualTo(plLineCreationMethodTestValue));
-            Assert.That(location.PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue));
-            Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue));
-            Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo(stringTestValue));
-            Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UpliftCriterionPiping, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UpliftCriterionStability, Is.EqualTo(doubleTestValue));
-            Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilityZoneType, Is.EqualTo(mstabZonesTypeTestValue));
-            Assert.That(location.ForbiddenZoneFactor, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewDikeTopWidth, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewDikeTopWidth, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewDikeSlopeInside, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewDikeSlopeInside, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewDikeSlopeOutside, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewDikeSlopeOutside, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewShoulderTopSlope, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewShoulderTopSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewShoulderBaseSlope, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewShoulderBaseSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewMaxHeightShoulderAsFraction, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewMaxHeightShoulderAsFraction, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewMinDistanceDikeToeStartDitch, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewMinDistanceDikeToeStartDitch, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UseNewDitchDefinition, Is.EqualTo(boolTestValue));
-            Assert.That(location.NewWidthDitchBottom, Is.EqualTo(doubleTestValue));
-            Assert.That(location.NewDepthDitch, Is.EqualTo(doubleTestValue));
-            Assert.That(location.NewSlopeAngleDitch, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilityDesignMethod, Is.EqualTo(stabilityDesignMethodTestValue));
-            Assert.That(location.SlopeAdaptionStartCotangent, Is.EqualTo(doubleTestValue));
-            Assert.That(location.SlopeAdaptionEndCotangent, Is.EqualTo(doubleTestValue));
-            Assert.That(location.SlopeAdaptionStepCotangent, Is.EqualTo(doubleTestValue));
-            Assert.That(location.DikeTableHeight, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RiverLevel, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RiverLevelLow, Is.EqualTo(doubleTestValue));
+            Assert.Multiple(() =>
+            {
+                Assert.That(location.SegmentId, Is.EqualTo(stringTestValue));
+                Assert.That(location.DampingFactorPl3, Is.EqualTo(doubleTestValue));
+                Assert.That(location.DampingFactorPl4, Is.EqualTo(doubleTestValue));
+                Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo(stringTestValue));
+                Assert.That(location.DistanceToEntryPoint, Is.EqualTo(doubleTestValue));
+                Assert.That(location.HeadPl2, Is.EqualTo(doubleTestValue));
+                Assert.That(location.HeadPl3, Is.EqualTo(doubleTestValue));
+                Assert.That(location.HeadPl4, Is.EqualTo(doubleTestValue));
+                Assert.That(location.MinimalCircleDepth, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PenetrationLength, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PolderLevel, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PLLineCreationMethod, Is.EqualTo(plLineCreationMethodTestValue));
+                Assert.That(location.PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue));
+                Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue));
+                Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo(stringTestValue));
+                Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UpliftCriterionPiping, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UpliftCriterionStability, Is.EqualTo(doubleTestValue));
+                Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilityZoneType, Is.EqualTo(mstabZonesTypeTestValue));
+                Assert.That(location.ForbiddenZoneFactor, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewDikeTopWidth, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewDikeTopWidth, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewDikeSlopeInside, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewDikeSlopeInside, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewDikeSlopeOutside, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewDikeSlopeOutside, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewShoulderTopSlope, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewShoulderTopSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewShoulderBaseSlope, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewShoulderBaseSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewMaxHeightShoulderAsFraction, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewMaxHeightShoulderAsFraction, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewMinDistanceDikeToeStartDitch, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewMinDistanceDikeToeStartDitch, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UseNewDitchDefinition, Is.EqualTo(boolTestValue));
+                Assert.That(location.NewWidthDitchBottom, Is.EqualTo(doubleTestValue));
+                Assert.That(location.NewDepthDitch, Is.EqualTo(doubleTestValue));
+                Assert.That(location.NewSlopeAngleDitch, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilityDesignMethod, Is.EqualTo(stabilityDesignMethodTestValue));
+                Assert.That(location.SlopeAdaptionStartCotangent, Is.EqualTo(doubleTestValue));
+                Assert.That(location.SlopeAdaptionEndCotangent, Is.EqualTo(doubleTestValue));
+                Assert.That(location.SlopeAdaptionStepCotangent, Is.EqualTo(doubleTestValue));
+                Assert.That(location.DikeTableHeight, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RiverLevel, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RiverLevelLow, Is.EqualTo(doubleTestValue));
+            });
         }
 
         [Test]
@@ -447,43 +453,46 @@
             mockImporter.RegisterCrossSectionAttribute(crossSectionMapping.Name, crossSectionMapping.File);
             mockImporter.Import(null);
 
-            Assert.That(location.SegmentId, Is.EqualTo(stringTestValue));
-            Assert.That(location.DampingFactorPl3, Is.EqualTo(dampingPl3Value));
-            Assert.That(location.DampingFactorPl4, Is.EqualTo(0)); // as testvalue is beyond the limits, its reset to 0
-            Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo(stringTestValue));
-            Assert.That(location.DistanceToEntryPoint, Is.EqualTo(doubleTestValue));
-            Assert.That(location.HeadPl2, Is.EqualTo(doubleTestValue));
-            Assert.That(location.HeadPl3, Is.EqualTo(doubleTestValue));
-            Assert.That(location.HeadPl4, Is.EqualTo(doubleTestValue));
-            Assert.That(location.MinimalCircleDepth, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PenetrationLength, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PolderLevel, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PLLineCreationMethod, Is.EqualTo(plLineCreationMethodTestValue));
-            Assert.That(location.PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue));
-            Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue));
-            Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue));
-            Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo(stringTestValue));
-            Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UpliftCriterionPiping, Is.EqualTo(doubleTestValue));
-            Assert.That(location.UpliftCriterionStability, Is.EqualTo(doubleTestValue));
-            Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilityZoneType, Is.EqualTo(mstabZonesTypeTestValue));
-            Assert.That(location.SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(doubleTestValue));
-            Assert.That(location.StabilityDesignMethod, Is.EqualTo(stabilityDesignMethodTestValue));
-            Assert.That(location.SlopeAdaptionStartCotangent, Is.EqualTo(doubleTestValue));
-            Assert.That(location.SlopeAdaptionEndCotangent, Is.EqualTo(doubleTestValue));
-            Assert.That(location.SlopeAdaptionStepCotangent, Is.EqualTo(doubleTestValue));
-            Assert.That(location.DikeTableHeight, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RiverLevel, Is.EqualTo(doubleTestValue));
-            Assert.That(location.RiverLevelLow, Is.EqualTo(doubleTestValue));
+            Assert.Multiple(() =>
+            {
+                Assert.That(location.SegmentId, Is.EqualTo(stringTestValue));
+                Assert.That(location.DampingFactorPl3, Is.EqualTo(dampingPl3Value));
+                Assert.That(location.DampingFactorPl4, Is.EqualTo(0)); // as testvalue is beyond the limits, its reset to 0
+                Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo(stringTestValue));
+                Assert.That(location.DistanceToEntryPoint, Is.EqualTo(doubleTestValue));
+                Assert.That(location.HeadPl2, Is.EqualTo(doubleTestValue));
+                Assert.That(location.HeadPl3, Is.EqualTo(doubleTestValue));
+                Assert.That(location.HeadPl4, Is.EqualTo(doubleTestValue));
+                Assert.That(location.MinimalCircleDepth, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PenetrationLength, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PolderLevel, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PLLineCreationMethod, Is.EqualTo(plLineCreationMethodTestValue));
+                Assert.That(location.PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue));
+                Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue));
+                Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue));
+                Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo(stringTestValue));
+                Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UpliftCriterionPiping, Is.EqualTo(doubleTestValue));
+                Assert.That(location.UpliftCriterionStability, Is.EqualTo(doubleTestValue));
+                Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilityZoneType, Is.EqualTo(mstabZonesTypeTestValue));
+                Assert.That(location.SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(doubleTestValue));
+                Assert.That(location.StabilityDesignMethod, Is.EqualTo(stabilityDesignMethodTestValue));
+                Assert.That(location.SlopeAdaptionStartCotangent, Is.EqualTo(doubleTestValue));
+                Assert.That(location.SlopeAdaptionEndCotangent, Is.EqualTo(doubleTestValue));
+                Assert.That(location.SlopeAdaptionStepCotangent, Is.EqualTo(doubleTestValue));
+                Assert.That(location.DikeTableHeight, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RiverLevel, Is.EqualTo(doubleTestValue));
+                Assert.That(location.RiverLevelLow, Is.EqualTo(doubleTestValue));
+            });
         }
 
         [Test]
@@ -545,7 +554,7 @@
             mockImporter.RegisterAttributeMapping(LocationShapeFileAttributeMap.PenetrationLengthAttributeId);
             mockImporter.Import(null);
 
-            Assert.That(mockImporter.ImportErrors.OfType<AttributeMissingException>().Count() == 1, Is.True, "The error list should contain an AttributeMissingException");
+            Assert.That(mockImporter.ImportErrors.OfType<AttributeMissingException>().Count(), Is.EqualTo(1), "The error list should contain an AttributeMissingException");
         }
 
         [Test]
@@ -645,7 +654,7 @@
             };
             importer.DataFileLocation = DirectoryWithDataShapeFiles;
             importer.RegisterAttributeMapping("someattributeid", "test", TestShapeFile);
-            Assert.That(importer.ImproperAttributeMessages.Count, Is.EqualTo(1));
+            Assert.That(importer.ImproperAttributeMessages, Has.Count.EqualTo(1));
         }
 
         [Test]
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LineAttributeImporterTest.cs
===================================================================
diff -u -r4890 -r4891
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LineAttributeImporterTest.cs	(.../LineAttributeImporterTest.cs)	(revision 4890)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LineAttributeImporterTest.cs	(.../LineAttributeImporterTest.cs)	(revision 4891)
@@ -183,9 +183,12 @@
             };
             importer.Import();
 
-            Assert.That(locations.Count, Is.EqualTo(10));
-            Assert.That(locations.First().LocationId, Is.EqualTo("TPL_Hempolder_0010"));
-            Assert.That(locations.Last().LocationId, Is.EqualTo("TPL_Hempolder_0100"));
+            Assert.That(locations, Has.Count.EqualTo(10));
+            Assert.Multiple(() =>
+            {
+                Assert.That(locations.First().LocationId, Is.EqualTo("TPL_Hempolder_0010"));
+                Assert.That(locations.Last().LocationId, Is.EqualTo("TPL_Hempolder_0100"));
+            });
         }
 
         [Test]
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatueRepositoryExtensionsTest.cs
===================================================================
diff -u -r4890 -r4891
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatueRepositoryExtensionsTest.cs	(.../FeatueRepositoryExtensionsTest.cs)	(revision 4890)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatueRepositoryExtensionsTest.cs	(.../FeatueRepositoryExtensionsTest.cs)	(revision 4891)
@@ -64,14 +64,20 @@
 
             IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
             Assert.That(results, Is.Not.Null);
-            Assert.That(results.Count(), Is.EqualTo(2));
-            Assert.That(results.Any(r => r.Key == 1), Is.True);
-            Assert.That(results.Any(r => r.Key == 0), Is.True);
+            Assert.Multiple(() =>
+            {
+                Assert.That(results.Count(), Is.EqualTo(2));
+                Assert.That(results.Any(r => r.Key == 1), Is.True);
+                Assert.That(results.Any(r => r.Key == 0), Is.True);
+            });
             IntersectionResult result = results.GetResultsHavingCount(1).Single();
-            Assert.That(geom1.Id, Is.EqualTo(result.Source.Id));
-            Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id));
-            Assert.That(result.IntersectionPoints.ElementAt(0).X, Is.EqualTo(-2).Within(0.0001));
-            Assert.That(result.IntersectionPoints.ElementAt(0).Y, Is.EqualTo(1).Within(0.0001));
+            Assert.Multiple(() =>
+            {
+                Assert.That(geom1.Id, Is.EqualTo(result.Source.Id));
+                Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id));
+                Assert.That(result.IntersectionPoints.ElementAt(0).X, Is.EqualTo(-2).Within(0.0001));
+                Assert.That(result.IntersectionPoints.ElementAt(0).Y, Is.EqualTo(1).Within(0.0001));
+            });
         }
 
         [Test]
@@ -106,15 +112,21 @@
             IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
 
             Assert.That(results, Is.Not.Null);
-            Assert.That(results.Count(), Is.EqualTo(1));
-            Assert.That(results.Any(r => r.Key == 1), Is.True);
+            Assert.Multiple(() =>
+            {
+                Assert.That(results.Count(), Is.EqualTo(1));
+                Assert.That(results.Any(r => r.Key == 1), Is.True);
 
-            Assert.That(results.GetResultsHavingCount(1).Count(), Is.EqualTo(2));
+                Assert.That(results.GetResultsHavingCount(1).Count(), Is.EqualTo(2));
+            });
             IntersectionResult result = results.ElementAt(0).First();
-            Assert.That(geom1.Id, Is.EqualTo(result.Source.Id));
-            Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id));
-            Assert.That(result.IntersectionPoints.ElementAt(0).X, Is.EqualTo(-2).Within(0.0001));
-            Assert.That(result.IntersectionPoints.ElementAt(0).Y, Is.EqualTo(1).Within(0.0001));
+            Assert.Multiple(() =>
+            {
+                Assert.That(geom1.Id, Is.EqualTo(result.Source.Id));
+                Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id));
+                Assert.That(result.IntersectionPoints.ElementAt(0).X, Is.EqualTo(-2).Within(0.0001));
+                Assert.That(result.IntersectionPoints.ElementAt(0).Y, Is.EqualTo(1).Within(0.0001));
+            });
         }
 
         [Test]
@@ -140,11 +152,17 @@
 
             IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
             Assert.That(results, Is.Not.Null);
-            Assert.That(results.Count(), Is.EqualTo(1));
-            Assert.That(results.GetResultsHavingCount(2).Count(), Is.EqualTo(1));
+            Assert.Multiple(() =>
+            {
+                Assert.That(results.Count(), Is.EqualTo(1));
+                Assert.That(results.GetResultsHavingCount(2).Count(), Is.EqualTo(1));
+            });
             IntersectionResult result = results.ElementAt(0).First();
-            Assert.That(geom1.Id, Is.EqualTo(result.Source.Id));
-            Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id));
+            Assert.Multiple(() =>
+            {
+                Assert.That(geom1.Id, Is.EqualTo(result.Source.Id));
+                Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id));
+            });
         }
 
         [Test]
@@ -170,8 +188,11 @@
 
             IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
             Assert.That(results, Is.Not.Null);
-            Assert.That(results.Count(), Is.EqualTo(1));
-            Assert.That(results.GetResultsHavingCount(0).Count(), Is.EqualTo(1));
+            Assert.Multiple(() =>
+            {
+                Assert.That(results.Count(), Is.EqualTo(1));
+                Assert.That(results.GetResultsHavingCount(0).Count(), Is.EqualTo(1));
+            });
         }
 
         #region Setup