Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r2644 -r2813
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2644)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 2813)
@@ -349,7 +349,7 @@
         /// In this test the values for headpl2 in the import files are:
         /// In shapefiles: -5.37 for both locations
         /// In locations.csv: -99 for both locations
-        /// Expected value in location will be -5.37 for both locations
+        /// Expected value in the scenario of the location will be -5.37 for both locations
         /// </summary>
         [Test]
         public void ValuesFromShapeFileOverwriteValuesFromLocationsCsv()
@@ -358,13 +358,19 @@
             string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault();
             dataPluginImporter.ImportDataForDikeRings(new List<string> { dikeRingId }, null);
 
-            IEnumerable<NameValueParameter> locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location1Id);
-            var nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray();
-            Assert.IsTrue(nameValueParameters.Any());
-            Assert.AreEqual("-5.37", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL2")).ParameterValue);
+            string scenarioIdOne = dataPluginImporter.GetScenarioList(dikeRingId, Location1Id).FirstOrDefault();
+            NameValueParameter[] scenarioDetailsOne = dataPluginImporter.GetScenarioDetails(dikeRingId, Location1Id, scenarioIdOne).ToArray();
+            Assert.IsNotEmpty(scenarioDetailsOne);
+            var headPl2ValueOne = scenarioDetailsOne.SingleOrDefault(x => x.ParameterName.Equals("HeadPL2"));
+            Assert.IsNotNull(headPl2ValueOne);
+            Assert.AreEqual("-5.37", headPl2ValueOne.ParameterValue);
 
-            locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location2Id);
-            Assert.AreEqual("-5.37", locationDetails.First(x => x.ParameterName.Equals("HeadPL2")).ParameterValue);
+            string scenarioIdTwo = dataPluginImporter.GetScenarioList(dikeRingId, Location2Id).FirstOrDefault();
+            NameValueParameter[] scenarioDetailsTwo = dataPluginImporter.GetScenarioDetails(dikeRingId, Location2Id, scenarioIdTwo).ToArray();
+            Assert.IsNotEmpty(scenarioDetailsTwo);
+            var headPl2ValueTwo = scenarioDetailsTwo.SingleOrDefault(x => x.ParameterName.Equals("HeadPL2"));
+            Assert.IsNotNull(headPl2ValueTwo);
+            Assert.AreEqual("-5.37", headPl2ValueTwo.ParameterValue);
         }
 
         /// <summary>