Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs
===================================================================
diff -u -r4047 -r4070
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs	(.../GeometryFileTest.cs)	(revision 4047)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs	(.../GeometryFileTest.cs)	(revision 4070)
@@ -31,52 +31,6 @@
     {
         private string existingFile;
 
-        #region Setup
-
-        [SetUp]
-        public void FixtureSetup()
-        {
-            existingFile = Guid.NewGuid() + ".tst";
-            using (var f = File.CreateText(existingFile))
-            {
-            }
-        }
-
-        [TearDown]
-        public void FixtureTearDown()
-        {
-            File.Delete(existingFile);
-        }
-
-        [SetUp]
-        public void TestSetup()
-        {
-        }
-
-        [TearDown]
-        public void TestTearDown()
-        {
-        }
-
-        #endregion
-
-        #region Mock
-
-        private class MockFile : FileLocation
-        {
-            private const string Extension = ".tst";
-            public MockFile(string fileLocation, string fileName) 
-                : base(fileLocation, fileName, Extension)
-            {                
-            }
-            public MockFile(string fileName) 
-                : base(fileName, Extension)
-            {
-            }
-        }
-
-        #endregion
-
         [Test]
         public void FileAcceptsEmptyLocation()
         {
@@ -88,7 +42,7 @@
         {
             const string fileName = "test.tst";
             var file = new MockFile("", fileName);
-            var expected = Path.Combine(Directory.GetCurrentDirectory(), fileName);
+            string expected = Path.Combine(Directory.GetCurrentDirectory(), fileName);
             Assert.AreEqual(expected, file.FullPath);
 
             file = new MockFile(fileName);
@@ -124,7 +78,6 @@
 
             file = new MockFile("test.tst");
             Assert.AreEqual("test.tst", file.FileName);
-
         }
 
         [Test]
@@ -146,7 +99,7 @@
 
         [Test]
         public void FileReturnsCorrectFullPathOnExistingFile()
-        {            
+        {
             string location = Directory.GetCurrentDirectory();
             var file = new MockFile(location, existingFile);
             Assert.AreEqual(location + "\\" + existingFile, file.FullPath);
@@ -168,5 +121,42 @@
             Assert.IsTrue(file.IsValid);
         }
 
+        #region Mock
+
+        private class MockFile : FileLocation
+        {
+            private const string Extension = ".tst";
+
+            public MockFile(string fileLocation, string fileName)
+                : base(fileLocation, fileName, Extension) {}
+
+            public MockFile(string fileName)
+                : base(fileName, Extension) {}
+        }
+
+        #endregion
+
+        #region Setup
+
+        [SetUp]
+        public void FixtureSetup()
+        {
+            existingFile = Guid.NewGuid() + ".tst";
+            using (StreamWriter f = File.CreateText(existingFile)) {}
+        }
+
+        [TearDown]
+        public void FixtureTearDown()
+        {
+            File.Delete(existingFile);
+        }
+
+        [SetUp]
+        public void TestSetup() {}
+
+        [TearDown]
+        public void TestTearDown() {}
+
+        #endregion
     }
 }
\ No newline at end of file