Index: Core/Common/test/Core.Common.TestUtil.Test/DirectoryDisposeHelperTest.cs
===================================================================
diff -u -ref03645b89161cd4351b386fd664acc27a5e1408 -rc68aca33d99e51c30d61810ad226f8630db55970
--- Core/Common/test/Core.Common.TestUtil.Test/DirectoryDisposeHelperTest.cs	(.../DirectoryDisposeHelperTest.cs)	(revision ef03645b89161cd4351b386fd664acc27a5e1408)
+++ Core/Common/test/Core.Common.TestUtil.Test/DirectoryDisposeHelperTest.cs	(.../DirectoryDisposeHelperTest.cs)	(revision c68aca33d99e51c30d61810ad226f8630db55970)
@@ -35,7 +35,7 @@
         public void Constructor_NullRoot_ThrowsArgumentNullException()
         {
             // Setup
-            string subfolder = "sub folder";
+            var subfolder = "sub folder";
 
             // Call
             TestDelegate test = () => new DirectoryDisposeHelper(null, subfolder);
@@ -52,7 +52,7 @@
             TestDelegate test = () => new DirectoryDisposeHelper(rootFolder, null);
 
             // Assert
-            ArgumentException exception = Assert.Throws<ArgumentException>(test);
+            var exception = Assert.Throws<ArgumentException>(test);
             Assert.AreEqual("subFolders", exception.ParamName);
         }
 
@@ -62,7 +62,7 @@
             // Setup
             string subFolder = Path.GetRandomFileName();
             string folderPath = Path.Combine(rootFolder, subFolder);
-            bool folderExists = false;
+            var folderExists = false;
 
             // Precondition
             Assert.IsFalse(Directory.Exists(folderPath), $"Precondition failed: Folder '{folderPath}' should not exist");
@@ -89,7 +89,7 @@
             string subFolder = Path.GetRandomFileName();
             string subSubFolder = Path.GetRandomFileName();
             string folderPath = Path.Combine(rootFolder, subFolder, subSubFolder);
-            bool folderExists = false;
+            var folderExists = false;
 
             // Precondition
             Assert.IsFalse(Directory.Exists(folderPath), $"Precondition failed: Folder '{folderPath}' should not exist");
@@ -233,7 +233,7 @@
                     TestDelegate call = () => disposeHelper.LockDirectory(FileSystemRights.Synchronize);
 
                     // Assert
-                    InvalidOperationException exception = Assert.Throws<InvalidOperationException>(call);
+                    var exception = Assert.Throws<InvalidOperationException>(call);
                     Assert.AreEqual($"Unable to lock '{folderPath}'.", exception.Message);
                     Assert.IsNotNull(exception.InnerException);
                 }
@@ -272,7 +272,7 @@
                 RemoveDirectoryAndFail(folderPath, exception);
             }
         }
-        
+
         [Test]
         public void UnlockDirectory_DirectoryNotLocked_Unlocksdirectory()
         {
Index: Core/Common/test/Core.Common.TestUtil.Test/FileDisposeHelperTest.cs
===================================================================
diff -u -rc899baf08791f622f518d4cc84ed5a6e27aac4c5 -rc68aca33d99e51c30d61810ad226f8630db55970
--- Core/Common/test/Core.Common.TestUtil.Test/FileDisposeHelperTest.cs	(.../FileDisposeHelperTest.cs)	(revision c899baf08791f622f518d4cc84ed5a6e27aac4c5)
+++ Core/Common/test/Core.Common.TestUtil.Test/FileDisposeHelperTest.cs	(.../FileDisposeHelperTest.cs)	(revision c68aca33d99e51c30d61810ad226f8630db55970)
@@ -130,7 +130,7 @@
                 using (new FileDisposeHelper(filePaths))
                 {
                     // Assert
-                    foreach (var filePath in filePaths)
+                    foreach (string filePath in filePaths)
                     {
                         Assert.IsTrue(File.Exists(filePath));
                     }
@@ -211,7 +211,7 @@
                     TestDelegate call = () => fileDisposeHelper.LockFiles();
 
                     // Assert
-                    InvalidOperationException exception = Assert.Throws<InvalidOperationException>(call);
+                    var exception = Assert.Throws<InvalidOperationException>(call);
                     Assert.AreEqual($"Unable to lock '{filePath}'.", exception.Message);
                     Assert.IsNotNull(exception.InnerException);
                 }
@@ -243,7 +243,7 @@
                     TestDelegate call = () => fileDisposeHelper.LockFiles();
 
                     // Assert
-                    InvalidOperationException exception = Assert.Throws<InvalidOperationException>(call);
+                    var exception = Assert.Throws<InvalidOperationException>(call);
                     Assert.AreEqual($"Unable to lock '{filePath}'.", exception.Message);
                     Assert.IsNotNull(exception.InnerException);
                 }
@@ -335,7 +335,7 @@
 
             try
             {
-                foreach (var filePath in filePaths)
+                foreach (string filePath in filePaths)
                 {
                     using (File.Create(filePath)) {}
 
@@ -352,7 +352,7 @@
             }
 
             // Assert
-            foreach (var filePath in filePaths)
+            foreach (string filePath in filePaths)
             {
                 Assert.IsFalse(File.Exists(filePath), $"'{filePath}' should have been deleted.");
             }