Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2795 -r2823
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2795)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2823)
@@ -56,12 +56,10 @@
         /// <summary>
         /// Create csv file with segments containing 1d soilprofiles
         /// </summary>
-        private void CreateSegmentsFor1DProfilesFile()
+        /// <param name="filePath"></param>
+        private static void CreateSegmentsFor1DProfilesFile(string filePath)
         {
-            string importFile = importFolder + "\\segments.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("segment_id;soilprofile_id;probability;calculation_type");
                 writer.WriteLine("1;1DP1;80;Stability");
@@ -75,12 +73,10 @@
         /// <summary>
         /// Create csv file with segments containing 2d geometries
         /// </summary>
-        private void CreateSegmentsFor2DGeometriesFile()
+        /// <param name="filePath"></param>
+        private static void CreateSegmentsFor2DGeometriesFile(string filePath)
         {
-            string importFile = importFolder + "\\segments.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("segment_id;soilgeometry2D_name;probability;calculation_type");
                 writer.WriteLine("1;GeomA;80;Stability");
@@ -91,12 +87,10 @@
         /// <summary>
         /// Create csv file with segments containing error header
         /// </summary>
-        private void CreateSegmentsFileWithIllegalHeader()
+        /// <param name="filePath"></param>
+        private static void CreateSegmentsFileWithIllegalHeader(string filePath)
         {
-            string importFile = importFolder + "\\segments.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("segment_id;soilgeometry2D_name;soilprofile_id;probability;calculation_type");
                 writer.WriteLine("1;GeomA;80;Stability");
@@ -105,12 +99,9 @@
         }
 
 
-        private void CreateSoilProfilesFileWithObsoleteColumns()
+        private static void CreateSoilProfilesFileWithObsoleteColumns(string filePath)
         {
-            string importFile = importFolder + "\\soilprofiles.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("soilprofile_id;top_level;soil_name;soiltype");
                 writer.WriteLine("1DP1;10;HW-OBO;zand");
@@ -128,12 +119,9 @@
             }
         }
 
-        private void CreateSoilProfilesFile()
+        private static void CreateSoilProfilesFile(string filePath)
         {
-            string importFile = importFolder + "\\soilprofiles.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("soilprofile_id;top_level;soil_name");
                 writer.WriteLine("1DP1;10;HW-OBO");
@@ -151,36 +139,27 @@
             }
         }
 
-        private void CreateSoilProfilesFileWithIllegalHeader()
+        private static void CreateSoilProfilesFileWithIllegalHeader(string filePath)
         {
-            string importFile = importFolder + "\\soilprofiles.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("soilprofile_id;soil_name");
                 writer.WriteLine("1DP1;10;HW-OBO");
             }
         }
 
-        private void CreateSoilProfilesFileWithIllegalHeaderField()
+        private static void CreateSoilProfilesFileWithIllegalHeaderField(string filePath)
         {
-            string importFile = importFolder + "\\soilprofiles.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine("soilprofile_id;soil_name;aaa;bbb;");
                 writer.WriteLine("1DP1;10;HW-OBO");
             }
         }
 
-        private void CreateCharacteristicPointsFile()
+        private static void CreateCharacteristicPointsFile(string filePath)
         {
-            string importFile = importFolder + "\\characteristicpoints.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "Profielnaam;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer");
@@ -189,12 +168,9 @@
             }
         }
 
-        private void CreateCharacteristicPointsFileWithLocationId()
+        private static void CreateCharacteristicPointsFileWithLocationId(string filePath)
         {
-            string importFile = importFolder + "\\characteristicpoints.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "LocationId;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer");
@@ -203,12 +179,9 @@
             }
         }
 
-        private void CreateCharacteristicPointsFileWithIllegalHeader()
+        private static void CreateCharacteristicPointsFileWithIllegalHeader(string filePath)
         {
-            string importFile = importFolder + "\\characteristicpoints.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "Profielnaam;X_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer");
@@ -217,12 +190,9 @@
             }
         }
 
-        private void CreateSurfaceLinesFile()
+        private static void CreateSurfaceLinesFile(string filePath)
         {
-            string importFile = importFolder + "\\surfacelines.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)");
@@ -233,12 +203,9 @@
             }
         }
 
-        private void CreateSurfaceLinesFileWithLocationId()
+        private static void CreateSurfaceLinesFileWithLocationId(string filePath)
         {
-            string importFile = importFolder + "\\surfacelines.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "LocationId;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)");
@@ -249,12 +216,9 @@
             }
         }
 
-        private void CreateSurfaceLinesFileWithIllegalValues()
+        private static void CreateSurfaceLinesFileWithIllegalValues(string filePath)
         {
-            string importFile = importFolder + "\\surfacelines.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)");
@@ -265,12 +229,9 @@
             }
         }
 
-        private void CreateSurfaceLinesFileWithIllegalHeaders()
+        private static void CreateSurfaceLinesFileWithIllegalHeaders(string filePath)
         {
-            string importFile = importFolder + "\\surfacelines.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "Proflnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)");
@@ -281,12 +242,9 @@
             }
         }
 
-        private void CreateLocationsFileWithObsoleteColumn()
+        private static void CreateLocationsFileWithObsoleteColumn(string filePath)
         {
-            string importFile = importFolder + "\\locations.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight");
@@ -297,12 +255,9 @@
             }
         }
 
-        private void CreateScenariosFile()
+        private static void CreateScenariosFile(string filePath)
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;water_height;water_height_low;dike_table_height;water_height_decimerings_hoogte;max_waterheight;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability");
@@ -313,12 +268,9 @@
             }
         }
 
-        private void CreateScenariosFileWithOffsetData()
+        private static void CreateScenariosFileWithOffsetData(string filePath)
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;water_height;water_height_low;dike_table_height;water_height_decimerings_hoogte;max_waterheight;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;UsePLLineOffsetBelowDikeCrestMiddle;PLLineOffsetBelowDikeCrestMiddle;UsePLLineOffsetFactorBelowShoulderCrest;PLLineOffsetFactorBelowShoulderCrest;head_pl3;head_pl4");
@@ -329,12 +281,9 @@
             }
         }
 
-        private void CreateScenariosWithHeadPl3AndHeadPl4File()
+        private static void CreateScenariosWithHeadPl3AndHeadPl4File(string filePath)
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;head_pl3;head_pl4");
@@ -345,12 +294,9 @@
             }
         }
 
-        private void CreateScenariosWithHeadPl3AndHeadPl4OldFormatFile()
+        private static void CreateScenariosWithHeadPl3AndHeadPl4OldFormatFile(string filePath)
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;HeadPl3;HeadPl4");
@@ -361,12 +307,9 @@
             }
         }
 
-        private void CreateScenariosWithPolderLevelFile()
+        private static void CreateScenariosWithPolderLevelFile(string filePath)
         {
-            string importFile = importFolder + "\\polderlevel.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;polderlevel;");
@@ -377,12 +320,9 @@
             }
         }
 
-        private void CreateScenariosWithHeadPL2File()
+        private static void CreateScenariosWithHeadPL2File(string filePath)
         {
-            string importFile = importFolder + "\\headPL2.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;head_pl2;");
@@ -393,12 +333,9 @@
             }
         }
 
-        private void CreateScenariosFileWithIllegalHeader()
+        private void CreateScenariosFileWithIllegalHeader(string filePath)
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;water_height;water_height_low;dike_table_height;water_height_decimerings_hoogte;max_waterheight;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability");
@@ -409,12 +346,9 @@
             }
         }
 
-        private void CreateScenariosFileWithIllegalValues()
+        private void CreateScenariosFileWithIllegalValues(string filePath)
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            using (var writer = File.CreateText(importFile))
+            using (var writer = File.CreateText(filePath))
             {
                 writer.WriteLine(
                     "location_id;location_scenario_id;water_height;water_height_low;dike_table_height;water_height_decimerings_hoogte;max_waterheight;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability");
@@ -442,11 +376,12 @@
         [Test]
         public void SegmentImporter1DProfileTest()
         {
-            string importFile = importFolder + "\\segments.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateSegmentsFor1DProfilesFile();
-            CsvImporterSegments csvImporterSegments = new CsvImporterSegments(importFile);
+            const string importFile = "segments.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSegmentsFor1DProfilesFile(testFilePath);
+            CsvImporterSegments csvImporterSegments = new CsvImporterSegments(testFilePath);
             IList<CsvImporterSegments.SegmentRecord> segmentRecords = csvImporterSegments.ImportedItems;
 
             Assert.AreEqual("1", segmentRecords[0].SegmentId);
@@ -466,11 +401,12 @@
         [Test]
         public void SegmentImporter2DGeometriesTest()
         {
-            string importFile = importFolder + "\\segments.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateSegmentsFor2DGeometriesFile();
-            CsvImporterSegments csvImporterSegments = new CsvImporterSegments(importFile);
+            const string importFile = "segments.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSegmentsFor2DGeometriesFile(testFilePath);
+            CsvImporterSegments csvImporterSegments = new CsvImporterSegments(testFilePath);
             IList<CsvImporterSegments.SegmentRecord> segmentRecords = csvImporterSegments.ImportedItems;
 
             Assert.AreEqual("1", segmentRecords[0].SegmentId);
@@ -488,21 +424,23 @@
         [ExpectedException(typeof(CsvImporterSegmentsException))]
         public void SegmentImporterIllegalHeaderTest()
         {
-            string importFile = importFolder + "\\segments.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateSegmentsFileWithIllegalHeader();
-            CsvImporterSegments csvImporterSegments = new CsvImporterSegments(importFile);
+            const string importFile = "segments.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSegmentsFileWithIllegalHeader(testFilePath);
+            CsvImporterSegments csvImporterSegments = new CsvImporterSegments(testFilePath);
         }
 
         [Test]
         public void SoilProfilesImporterFileWithObsoleteColumnTest()
         {
-            string importFile = importFolder + "\\soilprofiles.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateSoilProfilesFileWithObsoleteColumns();
-            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(importFile);
+            const string importFile = "soilprofiles.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSoilProfilesFileWithObsoleteColumns(testFilePath);
+            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath);
             IList<CsvImporterSoilProfiles.SoilProfileRecord> soilProfileRecords = csvImporterSoilProfiles.ImportedItems;
 
             Assert.AreEqual("1DP1", soilProfileRecords[0].SoilProfileId);
@@ -521,11 +459,12 @@
         [Test]
         public void SoilProfilesImporterCorrectFileTest()
         {
-            string importFile = importFolder + "\\soilprofiles.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateSoilProfilesFile();
-            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(importFile);
+            const string importFile = "soilprofiles.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSoilProfilesFile(testFilePath);
+            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath);
             IList<CsvImporterSoilProfiles.SoilProfileRecord> soilProfileRecords = csvImporterSoilProfiles.ImportedItems;
 
             Assert.AreEqual("1DP1", soilProfileRecords[0].SoilProfileId);
@@ -545,32 +484,47 @@
         [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterSoilProfilesException))]
         public void SoilProfilesImporterIllegalHeaderTest()
         {
-            CreateSoilProfilesFileWithIllegalHeader();
-            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(importFolder + "\\soilprofiles.csv");
+            const string importFile = "soilprofiles.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSoilProfilesFileWithIllegalHeader(testFilePath);
+            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath);
         }
 
         [Test]
         [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterSoilProfilesException))]
         public void SoilProfilesImporterMissingHeaderFieldTest()
         {
-            CreateSoilProfilesFileWithIllegalHeaderField();
-            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(importFolder + "\\soilprofiles.csv");
+            const string importFile = "soilprofiles.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSoilProfilesFileWithIllegalHeaderField(testFilePath);
+            CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath);
         }
 
         [Test]
         public void CharacteristicPointsImporterCorrectFileTest()
         {
-            CreateCharacteristicPointsFile();
-            CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(importFolder + "\\characteristicpoints.csv");
+            const string importFile = "characteristicpoints.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateCharacteristicPointsFile(testFilePath);
+            CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(testFilePath);
             IList<CsvImporterCharacteristicPoints.CharacteristicPointsRecord> characteristicPointsRecords = csvImporterCharacteristicPoints.ImportedItems;
             CheckCharacteristicPoints(characteristicPointsRecords);
         }
         
         [Test]
         public void CharacteristicPointsWithLocationIdImporterCorrectFileTest()
         {
-            CreateCharacteristicPointsFileWithLocationId();
-            CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(importFolder + "\\characteristicpoints.csv");
+            const string importFile = "characteristicpoints.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(testFilePath);
             IList<CsvImporterCharacteristicPoints.CharacteristicPointsRecord> characteristicPointsRecords = csvImporterCharacteristicPoints.ImportedItems;
             CheckCharacteristicPoints(characteristicPointsRecords);
         }
@@ -649,15 +603,23 @@
         [ExpectedException(typeof(CsvImporterCharacteristicPointsException))]
         public void CharacteristicPointsImporterIllegalHeaderTest()
         {
-            CreateCharacteristicPointsFileWithIllegalHeader();
-            CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(importFolder + "\\characteristicpoints.csv");
+            const string importFile = "characteristicpoints.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateCharacteristicPointsFileWithIllegalHeader(testFilePath);
+            CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(testFilePath);
         }
 
         [Test]
         public void SurfaceLinesImporterCorrectFileTest()
         {
-            CreateSurfaceLinesFile();
-            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(importFolder + "\\surfacelines.csv");
+            const string importFile = "surfacelines.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSurfaceLinesFile(testFilePath);
+            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(testFilePath);
             IList<CsvImporterSurfaceLines.SurfaceLineRecord> surfaceLineRecords = csvImporterSurfaceLines.ImportedItems;
 
             CheckSurfaceLine(surfaceLineRecords);
@@ -666,8 +628,12 @@
         [Test]
         public void SurfaceLinesWithLocationIdImporterCorrectFileTest()
         {
-            CreateSurfaceLinesFileWithLocationId();
-            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(importFolder + "\\surfacelines.csv");
+            const string importFile = "surfacelines.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSurfaceLinesFileWithLocationId(testFilePath);
+            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(testFilePath);
             IList<CsvImporterSurfaceLines.SurfaceLineRecord> surfaceLineRecords = csvImporterSurfaceLines.ImportedItems;
 
             CheckSurfaceLine(surfaceLineRecords);
@@ -709,27 +675,36 @@
         [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterSurfaceLinesException))]
         public void SurfaceLinesImporterIllegalHeaderTest()
         {
-            CreateSurfaceLinesFileWithIllegalHeaders();
-            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(importFolder + "\\surfacelines.csv");
+            const string importFile = "surfacelines.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSurfaceLinesFileWithIllegalHeaders(testFilePath);
+            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(testFilePath);
         }
 
         [Test]
         public void SurfaceLinesImporterIllegalValuesTest()
         {
-            CreateSurfaceLinesFileWithIllegalValues();
-            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(importFolder + "\\surfacelines.csv");
+            const string importFile = "surfacelines.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateSurfaceLinesFileWithIllegalValues(testFilePath);
+            CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(testFilePath);
             Assert.AreEqual(1, csvImporterSurfaceLines.ErrorMessages.Count);
         }
 
         [Test]
         public void LocationImporterCorrectFileTest()
         {
             const double tolerance = 0.001;
-            string importFile = importFolder + "\\locations.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateLocationsFileWithObsoleteColumn();
-            CsvImporterLocations csvImporterLocations = new CsvImporterLocations(importFolder + "\\locations.csv");
+            const string importFile = "locations.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateLocationsFileWithObsoleteColumn(testFilePath);
+            CsvImporterLocations csvImporterLocations = new CsvImporterLocations(testFilePath);
             IList<CsvImporterLocations.LocationRecord> locationRecords = csvImporterLocations.ImportedItems;
             Assert.AreEqual(2, locationRecords.Count);
             Assert.AreEqual("25-2-2-A-1-A", locationRecords[1].LocationId);
@@ -838,11 +813,12 @@
         [Test]
         public void ScenariosImporterCorrectFileTest()
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateScenariosFile();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(importFolder + "\\scenarios.csv");
+            const string importFile = "scenarios.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosFile(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
 
             Assert.AreEqual("D1", scenarioRecords[0].LocationId);
@@ -871,11 +847,12 @@
         [Test]
         public void ScenariosImporterCorrectFileTestWithOffsetData()
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateScenariosFileWithOffsetData();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(importFolder + "\\scenarios.csv");
+            const string importFile = "scenarios.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosFileWithOffsetData(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
 
             Assert.AreEqual("D1", scenarioRecords[0].LocationId);
@@ -922,36 +899,40 @@
         }
 
         [Test]
-        [ExpectedException(typeof(Deltares.Dam.Data.CsvImporters.CsvImporterScenariosException))]
+        [ExpectedException(typeof(CsvImporterScenariosException))]
         public void ScenariosImporterIllegalHeaderTest()
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateScenariosFileWithIllegalHeader();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(importFolder + "\\scenarios.csv");
+            const string importFile = "scenarios.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosFileWithIllegalHeader(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
         }
 
         [Test]
         public void ScenariosImporterIllegalValuesTest()
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateScenariosFileWithIllegalValues();
+            const string importFile = "scenarios.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosFileWithIllegalValues(testFilePath);
             CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(importFile);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
+            Assert.IsEmpty(scenarioRecords);
             Assert.AreEqual(2, csvImporterScenarios.ErrorMessages.Count);
         }
 
         [Test]
         public void ScenariosImporterWithHeadPl3AndHeadPl4Test()
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateScenariosWithHeadPl3AndHeadPl4File();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(importFolder + "\\scenarios.csv");
+            const string importFile = "scenarios.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosWithHeadPl3AndHeadPl4File(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
 
             Assert.AreEqual("D1", scenarioRecords[0].LocationId);
@@ -968,11 +949,12 @@
         [Test]
         public void ScenariosImporterWithHeadPl3AndHeadPl4OldFormatTest()
         {
-            string importFile = importFolder + "\\scenarios.csv";
-            if (File.Exists(importFile))
-                File.Delete(importFile);
-            CreateScenariosWithHeadPl3AndHeadPl4OldFormatFile();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(importFolder + "\\scenarios.csv");
+            const string importFile = "scenarios.csv";
+            string testFilePath = Path.Combine(importFolder, importFile);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosWithHeadPl3AndHeadPl4OldFormatFile(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
 
             Assert.AreEqual("D1", scenarioRecords[0].LocationId);
@@ -990,11 +972,11 @@
         public void ScenariosImporterWithPolderLevelTest()
         {
             const string fileName = "polderlevel.csv";
-            string filePath = Path.Combine(importFolder, fileName);
-            if (File.Exists(filePath))
-                File.Delete(filePath);
-            CreateScenariosWithPolderLevelFile();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(filePath);
+            string testFilePath = Path.Combine(importFolder, fileName);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosWithPolderLevelFile(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
 
             Assert.AreEqual("D1", scenarioRecords[0].LocationId);
@@ -1010,11 +992,11 @@
         public void ScenariosImporterWithHeadPL2Test()
         {
             const string fileName = "headPL2.csv";
-            string filePath = Path.Combine(importFolder, fileName);
-            if (File.Exists(filePath))
-                File.Delete(filePath);
-            CreateScenariosWithHeadPL2File();
-            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(filePath);
+            string testFilePath = Path.Combine(importFolder, fileName);
+            if (File.Exists(testFilePath))
+                File.Delete(testFilePath);
+            CreateScenariosWithHeadPL2File(testFilePath);
+            CsvImporterScenarios csvImporterScenarios = new CsvImporterScenarios(testFilePath);
             IList<CsvImporterScenarios.ScenarioRecord> scenarioRecords = csvImporterScenarios.ImportedItems;
 
             Assert.AreEqual("D1", scenarioRecords[0].LocationId);