Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4625)
@@ -33,7 +33,7 @@
     {
         DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InApplicationMap;
         string projectWorkingPath = DamProject.ProjectWorkingPath;
-        Assert.AreEqual(Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation", projectWorkingPath);
+        Assert.That(projectWorkingPath, Is.EqualTo(Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation"));
     }
 
     [Test]
@@ -43,7 +43,7 @@
         DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InUserMap;
         DamProject.UserWorkingPath = userProjectPath;
         string projectWorkingPath = DamProject.ProjectWorkingPath;
-        Assert.AreEqual(userProjectPath, projectWorkingPath);
+        Assert.That(projectWorkingPath, Is.EqualTo(userProjectPath));
     }
 
     [Test]
@@ -55,7 +55,7 @@
         damProject.ProjectFileName = cProjectFilename;
         DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InProjectMap;
         string projectWorkingPath = DamProject.ProjectWorkingPath;
-        Assert.AreEqual(cProjectWorkingPath, projectWorkingPath);
+        Assert.That(projectWorkingPath, Is.EqualTo(cProjectWorkingPath));
     }
 
     [Test]
@@ -64,7 +64,7 @@
         var projectFilename = "Delfland.damx";
         var mapName = @"..\..\geometries\";
         string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 2);
-        Assert.AreEqual(@"Delfland.geometries2D.2\", newMapname);
+        Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D.2\"));
     }
 
     [Test]
@@ -73,7 +73,7 @@
         var projectFilename = "Delfland.damx";
         var mapName = @"Delfland.geometries2D.10\";
         string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 10);
-        Assert.AreEqual(@"Delfland.geometries2D.10\", newMapname);
+        Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D.10\"));
     }
 
     [Test]
@@ -89,8 +89,8 @@
         });
         damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
         damProject.AssignGeometry2DMapnameIfNotAssigned(mapName2);
-        Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D);
-        Assert.AreEqual(mapName1, damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D);
-        Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D);
+        Assert.That(damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D, Is.EqualTo(mapName2));
+        Assert.That(damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D, Is.EqualTo(mapName1));
+        Assert.That(damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D, Is.EqualTo(mapName2));
     }
 }
\ No newline at end of file