Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs
===================================================================
diff -u -r6932 -r6945
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs	(.../DikeImporterTests.cs)	(revision 6932)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs	(.../DikeImporterTests.cs)	(revision 6945)
@@ -39,6 +39,7 @@
 public class DikeImporterTests
 {
     private DataSourceContainer dataSourceContainer;
+    private string importFolder;
 
     [Test]
     [TestCase(DamProjectType.Design)]
@@ -285,6 +286,11 @@
 
                 // Check aquifers
                 Assert.That(dike.Aquifers, Has.Count.EqualTo(2));
+                
+                // Surface lines of imported dike have same instance
+                Location location = dike.Locations.First(l => l.Name.Equals("location_dijkring10_dwp28_6"));
+                SurfaceLine2 surfaceLine = dike.SurfaceLines2.First(s => s.Name.Equals(location.SurfaceLine2.Name));
+                Assert.That(surfaceLine, Is.SameAs(location.SurfaceLine2));
             });
         }
     }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs
===================================================================
diff -u -r6669 -r6945
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs	(.../CsvImporterTests.cs)	(revision 6669)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs	(.../CsvImporterTests.cs)	(revision 6945)
@@ -59,6 +59,13 @@
     }
 
     [Test]
+    public void CvsImporter_ImportFromNonExistingDirectory_ThrowsDirectoryNotFoundException()
+    {
+        var csvImporter = new CsvImporter();
+        Assert.Throws<DirectoryNotFoundException>(() => csvImporter.ImportCsvDataFromDirectory("C:\\SomeNoneExistingDirectory", null, DamProjectType.Design));
+    }
+
+    [Test]
     public void SegmentImporterThrowsArgumentExceptionWhenFileNameIsEmpty()
     {
         Assert.That(() => new CsvImporterSegments(""), Throws.ArgumentException);