Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs
===================================================================
diff -u -r4539 -r4609
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs	(.../DikeTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs	(.../DikeTest.cs)	(revision 4609)
@@ -106,7 +106,20 @@
         surfaceLine1.AddCharacteristicPoint(new GeometryPoint(41.5, 0.0, -3.76), CharacteristicPointType.DikeToeAtPolder);
         surfaceLine1.AddCharacteristicPoint(new GeometryPoint(85.4, 0.0, -3.61));
     }
-
+    [TearDown]
+    public void TestTeardown()
+    {
+        if (location1 != null)
+        {
+            location1.Dispose();
+            location1 = null;
+        }
+        if (surfaceLine1 != null)
+        {
+            surfaceLine1.Dispose();
+            surfaceLine1 = null;
+        }
+    }
     [Test]
     public void DefaultConstructor_ExpectedValues()
     {
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs
===================================================================
diff -u -r4539 -r4609
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs	(.../SoilProfile2DImporterTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs	(.../SoilProfile2DImporterTest.cs)	(revision 4609)
@@ -96,7 +96,7 @@
             IEnumerable<SoilProfile2D> soilProfiles = SoilProfile2DImporter.Import(TestDataFolder, segment, availableSoils);
 
             // Assert
-            Assert.That(soilProfiles, Has.Count.EqualTo(2));
+            Assert.That(soilProfiles.Count, Is.EqualTo(2));
 
             SoilProfile2D soilProfileOne = soilProfiles.ElementAt(0);
             Assert.That(soilProfileOne.Name, Is.EqualTo(profileOneName));
@@ -142,7 +142,7 @@
             IEnumerable<SoilProfile2D> soilProfiles = SoilProfile2DImporter.Import(TestDataFolder, segment, availableSoils);
 
             // Assert
-            Assert.That(soilProfiles, Has.Count.EqualTo(2));
+            Assert.That(soilProfiles.Count, Is.EqualTo(2));
 
             SoilProfile2D soilProfileOne = soilProfiles.ElementAt(0);
             Assert.That(soilProfileOne.Name, Is.EqualTo(profileOneFileName));