Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
===================================================================
diff -u -r2814 -r2815
--- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs	(.../DataPluginImporterCsvTests.cs)	(revision 2814)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs	(.../DataPluginImporterCsvTests.cs)	(revision 2815)
@@ -80,11 +80,11 @@
             Assert.AreEqual(location18_6Id, locationInfo.Name);
 
             IEnumerable<NameValueParameter> locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, location18_6Id);
-            Assert.IsTrue(locationDetails.Count() > 0);
-            Assert.AreEqual("dijkring10_dwp18_6", locationDetails.Where(x => x.ParameterName.Equals("SurfaceLineId")).FirstOrDefault().ParameterValue);
-            Assert.AreEqual("segment_dijkring10_dwp18_6", locationDetails.Where(x => x.ParameterName.Equals("SegmentId")).FirstOrDefault().ParameterValue);
-            Assert.AreEqual("192584.1", locationDetails.Where(x => x.ParameterName.Equals("XRd")).FirstOrDefault().ParameterValue);
-            Assert.AreEqual("511740.3", locationDetails.Where(x => x.ParameterName.Equals("YRd")).FirstOrDefault().ParameterValue);
+            Assert.IsTrue(locationDetails.Any());
+            Assert.AreEqual("dijkring10_dwp18_6", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("SurfaceLineId")).ParameterValue);
+            Assert.AreEqual("segment_dijkring10_dwp18_6", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("SegmentId")).ParameterValue);
+            Assert.AreEqual("192584.1", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("XRd")).ParameterValue);
+            Assert.AreEqual("511740.3", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("YRd")).ParameterValue);
         }
 
         [Test]
@@ -106,8 +106,8 @@
             Assert.AreEqual("10Y_054_STBI.sti", soilProfile2DId);
 
             IEnumerable<NameValueParameter> profileDetails = dataPluginImporter.GetSegmentProfile2DDetails(dikeRingId, segment05_4Id, soilProfile2DId, FailureMechanismSystemType.StabilityInside);
-            Assert.AreEqual("100", profileDetails.Where(x => x.ParameterName.Equals("Probability")).FirstOrDefault().ParameterValue);
-            Assert.AreEqual("StabilityInside", profileDetails.Where(x => x.ParameterName.Equals("FailureMechanismType")).FirstOrDefault().ParameterValue);
+            Assert.AreEqual("100", profileDetails.FirstOrDefault(x => x.ParameterName.Equals("Probability")).ParameterValue);
+            Assert.AreEqual("StabilityInside", profileDetails.FirstOrDefault(x => x.ParameterName.Equals("FailureMechanismType")).ParameterValue);
         }
 
         [Test]