diff --git a/src/GitHub.TeamFoundation.14/RegistryHelper.cs b/src/GitHub.TeamFoundation.14/RegistryHelper.cs
index 92e252676..f4fa44eb3 100644
--- a/src/GitHub.TeamFoundation.14/RegistryHelper.cs
+++ b/src/GitHub.TeamFoundation.14/RegistryHelper.cs
@@ -9,6 +9,7 @@ using GitHub.Models;
 using GitHub.Services;
 using Microsoft.Win32;
 using Serilog;
+using static System.FormattableString;
 
 namespace GitHub.TeamFoundation
 {
@@ -18,7 +19,7 @@ namespace GitHub.TeamFoundation
 
         static RegistryKey OpenGitKey(string path)
         {
-            var keyName = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}";
+            var keyName = Invariant($"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}");
             return Registry.CurrentUser.OpenSubKey(keyName, true);
         }
 
@@ -64,7 +65,7 @@ namespace GitHub.TeamFoundation
         const string MRUKeyPath = "MRUSettingsLocalProjectLocationEntries";
         internal static string SetDefaultProjectPath(string path)
         {
-            var newProjectDialogKeyPath = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog";
+            var newProjectDialogKeyPath = Invariant($"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog");
 
             var old = String.Empty;
             try
diff --git a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs
index 5de6ff8ca..8a2ebb497 100644
--- a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs
+++ b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs
@@ -17,7 +17,7 @@ using static Microsoft.VisualStudio.VSConstants;
 
 public class VSGitExtTests
 {
-    public class TheConstructor
+    public class TheConstructor : TestBaseClass
     {
         [TestCase(true, 1)]
         [TestCase(false, 0)]
@@ -63,7 +63,7 @@ public class VSGitExtTests
         }
     }
 
-    public class TheActiveRepositoriesChangedEvent
+    public class TheActiveRepositoriesChangedEvent : TestBaseClass
     {
         [Test]
         public void GitExtPropertyChangedEvent_ActiveRepositoriesChangedIsFired()
@@ -133,7 +133,7 @@ public class VSGitExtTests
         }
     }
 
-    public class TheActiveRepositoriesProperty
+    public class TheActiveRepositoriesProperty : TestBaseClass
     {
         [Test]
         public void RepositoryOpenContextNotActive_IsEmpty()