Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs
===================================================================
diff -u -r6436 -r6823
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 6823)
@@ -62,35 +62,19 @@
     public void NewGeometry2DMapnameCorrectIfNewLocation()
     {
         var projectFilename = "Delfland.damx";
-        var mapName = @"..\..\geometries\";
-        string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 2);
-        Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D.2\"));
+        string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename);
+        Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D\"));
     }
 
     [Test]
-    public void NewGeometry2DMapnameCorrectIfSourceIsTarget()
-    {
-        var projectFilename = "Delfland.damx";
-        var mapName = @"Delfland.geometries2D.10\";
-        string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 10);
-        Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D.10\"));
-    }
-
-    [Test]
     public void CanAssignGeometry2DMapnameIfNotAssigned()
     {
         const string mapName1 = @"Test1\";
-        const string mapName2 = @"Test2\";
         using var damProject = new DamProject();
-        damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
-        damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike
-        {
-            MapForSoilGeometries2D = mapName1
-        });
-        damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
-        damProject.AssignGeometry2DMapnameIfNotAssigned(mapName2);
-        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));
+        damProject.DamProjectData.WaterBoard.Dike = new Dike();
+        Assert.That(damProject.DamProjectData.WaterBoard.Dike.MapForSoilGeometries2D, Is.Null);
+
+        damProject.AssignGeometry2DMapnameIfNotAssigned(mapName1);
+        Assert.That(damProject.DamProjectData.WaterBoard.Dike.MapForSoilGeometries2D, Is.EqualTo(mapName1));
     }
 }
\ No newline at end of file