Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs
===================================================================
diff -u -r6873 -r6880
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs	(.../DikeImporterTests.cs)	(revision 6873)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs	(.../DikeImporterTests.cs)	(revision 6880)
@@ -55,17 +55,23 @@
 
         // Check Dike
         Assert.That(dike, Is.Not.Null);
-        
-        //Check locations
-        Assert.That(dike.Locations, Has.Count.EqualTo(2));
+        Assert.Multiple(() =>
+        {
 
-        // Check Soilprofiles
-        Assert.That(dike.SoilProfiles, Has.Count.EqualTo(23));
+            //Check locations
+            Assert.That(dike.Locations, Has.Count.EqualTo(2));
+
+            // Check Soilprofiles
+            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"));
+        Assert.Multiple(() =>
+        {
+            Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo("kade"));
 
-        //Check Soils
-        Assert.That(dike.SoilList.Soils, Has.Count.EqualTo(51));
+            //Check Soils
+            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));
 
@@ -295,7 +301,7 @@
         Assert.That(dike, Is.Not.Null);
         
         //Check locations
-        Assert.That(dike.Locations.Count, Is.EqualTo(2));
+        Assert.That(dike.Locations, Has.Count.EqualTo(2));
     }
 
     [Test]
@@ -321,16 +327,22 @@
 
             // Check Dike
             Assert.That(dike, Is.Not.Null);
-            
-            //Check locations
-            Assert.That(dike.Locations.Count, Is.EqualTo(2));
+            Assert.Multiple(() =>
+            {
 
-            // Check Soilprofiles
-            // Count is 43: 23 (imported) + 7 (generated for first location) + 13 (generated for second location) 
-            Assert.That(dike.SoilProfiles.Count, Is.EqualTo(43));
+                //Check locations
+                Assert.That(dike.Locations, Has.Count.EqualTo(2));
+
+                // Check Soilprofiles
+                // Count is 43: 23 (imported) + 7 (generated for first location) + 13 (generated for second location) 
+                Assert.That(dike.SoilProfiles, Has.Count.EqualTo(43));
+            });
             SoilProfile1D soilProfile = dike.SoilProfiles.First(x => x.Name.Equals("25_2_1_bz_4"));
-            Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo("kade"));
-            Assert.That(soilProfile.TopLevel, Is.EqualTo(60.0));
+            Assert.Multiple(() =>
+            {
+                Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo("kade"));
+                Assert.That(soilProfile.TopLevel, Is.EqualTo(60.0));
+            });
 
             // Check if all profiles are made absolute from relative
             foreach (Location location in dike.Locations)
@@ -394,11 +406,14 @@
             Assert.That(dike, Is.Not.Null);
             
             //Check locations
-            Assert.That(dike.Locations.Count, Is.EqualTo(2));
-            Assert.That(dike.Locations[0].StabilityZoneType, Is.EqualTo(StabilityZoneType.NoZones));
-            Assert.That(dike.Locations[0].ForbiddenZoneFactor, Is.EqualTo(0.5).Within(cTolerance));
-            Assert.That(dike.Locations[1].StabilityZoneType, Is.EqualTo(StabilityZoneType.ForbiddenZone));
-            Assert.That(dike.Locations[1].ForbiddenZoneFactor, Is.EqualTo(0.9).Within(cTolerance));
+            Assert.That(dike.Locations, Has.Count.EqualTo(2));
+            Assert.Multiple(() =>
+            {
+                Assert.That(dike.Locations[0].StabilityZoneType, Is.EqualTo(StabilityZoneType.NoZones));
+                Assert.That(dike.Locations[0].ForbiddenZoneFactor, Is.EqualTo(0.5).Within(cTolerance));
+                Assert.That(dike.Locations[1].StabilityZoneType, Is.EqualTo(StabilityZoneType.ForbiddenZone));
+                Assert.That(dike.Locations[1].ForbiddenZoneFactor, Is.EqualTo(0.9).Within(cTolerance));
+            });
         }
     }
 }
\ No newline at end of file