Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExporterTest.cs
===================================================================
diff -u -r4047 -r4070
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExporterTest.cs	(.../CsvExporterTest.cs)	(revision 4047)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExporterTest.cs	(.../CsvExporterTest.cs)	(revision 4070)
@@ -53,73 +53,72 @@
         public void OverwriteExistingFileShouldWorkWithoutException()
         {
             const string writtenContent = "something";
-            var file = File.CreateText(FileName);
+            StreamWriter file = File.CreateText(FileName);
             file.WriteLine(writtenContent);
             file.Close();
             var exportData = new CsvExportData("locatioName", "scenarioName");
-            var creator = new CsvExporter<CsvExportData>(FileName, new List<CsvExportData> { exportData });
+            var creator = new CsvExporter<CsvExportData>(FileName, new List<CsvExportData>
+            {
+                exportData
+            });
             creator.WriteFile();
-            using (var reader = File.OpenText(FileName))
+            using (StreamReader reader = File.OpenText(FileName))
             {
-                var fileContent = reader.ReadToEnd();
+                string fileContent = reader.ReadToEnd();
                 Assert.IsFalse(fileContent.Contains((writtenContent)));
             }
         }
 
         [Test]
         public void ThrowsIndexAlreadyExistsWhenDeclaredMultipleTimes()
         {
-            var creator = new CsvExporter<DataStubWithWrongMetaData>(FileName, 
-                new List<DataStubWithWrongMetaData> { new DataStubWithWrongMetaData() });
+            var creator = new CsvExporter<DataStubWithWrongMetaData>(FileName,
+                                                                     new List<DataStubWithWrongMetaData>
+                                                                     {
+                                                                         new DataStubWithWrongMetaData()
+                                                                     });
             Assert.That(() => creator.WriteFile(), Throws.InstanceOf<CsvExporterException>());
         }
 
         [Test]
         public void ColumnHeaderIsWrittenCorrectly()
         {
             var dataItems = new List<DataStub>
-                            {
-                                new DataStub() { ID = 1, Name = "Barry", Average = 95.4 },
-                                new DataStub() { ID = 2, Name = "Tom", Average = 97.3 },
-                                new DataStub() { ID = 3, Name = "Remko", Average = 92.2}
-                            };
+            {
+                new DataStub
+                {
+                    ID = 1,
+                    Name = "Barry",
+                    Average = 95.4
+                },
+                new DataStub
+                {
+                    ID = 2,
+                    Name = "Tom",
+                    Average = 97.3
+                },
+                new DataStub
+                {
+                    ID = 3,
+                    Name = "Remko",
+                    Average = 92.2
+                }
+            };
 
             var creator = new CsvExporter<DataStub>(FileName, dataItems)
-                              {
-                                  WriteHeaderInFirstLine = true
-                              };
-            
+            {
+                WriteHeaderInFirstLine = true
+            };
+
             creator.WriteFile();
 
-            using (var reader = File.OpenText(FileName))
+            using (StreamReader reader = File.OpenText(FileName))
             {
-                var fileContent = reader.ReadToEnd();
+                string fileContent = reader.ReadToEnd();
                 Assert.IsTrue(fileContent.Contains("ID;Naam"));
             }
-
         }
 
-        class DataStub
-        {
-            [CsvExportColumn("ID", 1)]
-            public int ID { get; set; }
-
-            [CsvExportColumn("Naam", 2)]
-            public string Name { get; set; }
-
-            [CsvExportColumn("Gemiddelde", 3)]
-            public double Average { get; set; }
-        }
-
-        class DataStubWithWrongMetaData
-        {
-            [CsvExportColumn("ID", 1)]
-            public int ID { get; set; }
-
-            [CsvExportColumn("Naam", 1)]
-            public string Name { get; set; }
-        }
-
         [Test]
         public void TestRemoveCarriageReturnsFromMessage()
         {
@@ -133,9 +132,24 @@
         {
             var csvExportData = new CsvExportData();
             csvExportData.ResultMessage = "text1.\r\ntext2.\r\n";
-            var message = csvExportData.ResultMessage;
+            string message = csvExportData.ResultMessage;
             Assert.AreEqual("text1. text2.", message);
         }
 
+        class DataStub
+        {
+            [CsvExportColumn("ID", 1)] public int ID { get; set; }
+
+            [CsvExportColumn("Naam", 2)] public string Name { get; set; }
+
+            [CsvExportColumn("Gemiddelde", 3)] public double Average { get; set; }
+        }
+
+        class DataStubWithWrongMetaData
+        {
+            [CsvExportColumn("ID", 1)] public int ID { get; set; }
+
+            [CsvExportColumn("Naam", 1)] public string Name { get; set; }
+        }
     }
 }
\ No newline at end of file