Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r2472 -r2491
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2491)
@@ -57,21 +57,21 @@
             private double safetyFactorStabilityOuterSlope = 1.0;
 
             public int ScenarioRecordId { get; set; } 
-            public string LocationId { get; set; } //v
-            public string LocationScenarioId { get; set; } //v
-            public double? WaterHeight { get; set; } //v
-            public double? WaterHeightLow { get; set; } //o
-            public double? DikeTableHeight { get; set; } //v
-            public double? PlLineOffsetBelowDikeTopAtRiver { get; set; } //o
-            public double? PlLineOffsetBelowDikeTopAtPolder { get; set; } //o
-            public double? PlLineOffsetBelowShoulderBaseInside { get; set; } //o
-            public double? PlLineOffsetBelowDikeToeAtPolder { get; set; } //o
-            public double? PlLineOffsetBelowDikeCrestMiddle { get; set; } //o
-            public double? PlLineOffsetFactorBelowShoulderCrest { get; set; } //o
-            public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; } //o
-            public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; } //o
-            public double? HeadPl3 { get; set; } //o
-            public double? HeadPl4 { get; set; } //o
+            public string LocationId { get; set; } //required
+            public string LocationScenarioId { get; set; } //required
+            public double? WaterHeight { get; set; } //optional
+            public double? WaterHeightLow { get; set; } //optional
+            public double? DikeTableHeight { get; set; } //optional
+            public double? PlLineOffsetBelowDikeTopAtRiver { get; set; } //optional
+            public double? PlLineOffsetBelowDikeTopAtPolder { get; set; } //optional
+            public double? PlLineOffsetBelowShoulderBaseInside { get; set; } //optional
+            public double? PlLineOffsetBelowDikeToeAtPolder { get; set; } //optional
+            public double? PlLineOffsetBelowDikeCrestMiddle { get; set; } //optional
+            public double? PlLineOffsetFactorBelowShoulderCrest { get; set; } //optional
+            public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; } //optional
+            public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; } //optional
+            public double? HeadPl3 { get; set; } //optional
+            public double? HeadPl4 { get; set; } //optional
 
             public double UpliftCriterionPiping
             {
Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r2471 -r2491
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2471)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2491)
@@ -243,7 +243,7 @@
 
         private void CreateLocationsFileWithWaterHeight(string importFile)
         {
-            // A valid locations.csv has at least 3 columns.
+            // A valid locations.csv has at least 3 columns
             // Required are location_id, surfaceline_id, segment_id.
             // For the test we need dikering_id as well.
             // Include column for WaterHeight
@@ -260,6 +260,8 @@
         private void CreateLocationsFileWithoutWaterHeight(string importFile)
         {
             // A valid locations.csv has at least 3 columns
+            // Required are location_id, surfaceline_id, segment_id.
+            // For the test we need dikering_id as well.
             // Do NOT include column for WaterHeight
             if (File.Exists(importFile))
                 File.Delete(importFile);
@@ -274,7 +276,7 @@
         private void CreateScenariosFileWithWaterHeight(string importFile)
         {
             // A valid scenarios.csv has at least 2 columns
-            // Required are location_id, location_scenario_id, 
+            // Required are location_id, location_scenario_id 
             // Include column for WaterHeight
             if (File.Exists(importFile))
                 File.Delete(importFile);
@@ -289,7 +291,7 @@
         private void CreateScenariosFileWithoutWaterHeight(string importFile)
         {
             // A valid scenarios.csv has at least 2 columns
-            // Required are location_id, location_scenario_id, water_height and dike_table_height.
+            // Required are location_id, location_scenario_id
             // Do NOT include column for WaterHeight
             if (File.Exists(importFile))
                 File.Delete(importFile);