diff --git a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs
index 624ae434c..40459c2fd 100644
--- a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs
+++ b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs
@@ -60,6 +60,16 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Solution test settings file could not be parsed, check file: {0}
+        ///Exception: {1}.
+        /// </summary>
+        public static string CantParseSettings {
+            get {
+                return ResourceManager.GetString("CantParseSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Google Test Adapter.
         /// </summary>
@@ -69,6 +79,33 @@ public static string ExtensionName {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to RunSettingsDocument does not contain a RunSettings node! Canceling settings merging....
+        /// </summary>
+        public static string RunSettingsMissingNode {
+            get {
+                return ResourceManager.GetString("RunSettingsMissingNode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Solution test settings file found at &apos;{0}&apos;, but does not contain {1} node.
+        /// </summary>
+        public static string SolutionFoundButMissingNode {
+            get {
+                return ResourceManager.GetString("SolutionFoundButMissingNode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string String1 {
+            get {
+                return ResourceManager.GetString("String1", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Google Test Adapter: Test discovery starting....
         /// </summary>
diff --git a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx
index 049878359..772ef0b16 100644
--- a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx
+++ b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx
@@ -117,9 +117,24 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CantParseSettings" xml:space="preserve">
+    <value>Solution test settings file could not be parsed, check file: {0}
+Exception: {1}</value>
+  </data>
   <data name="ExtensionName" xml:space="preserve">
     <value>Google Test Adapter</value>
   </data>
+  <data name="RunSettingsMissingNode" xml:space="preserve">
+    <value>RunSettingsDocument does not contain a RunSettings node! Canceling settings merging...</value>
+  </data>
+  <data name="SolutionFoundButMissingNode" xml:space="preserve">
+    <value>Solution test settings file found at '{0}', but does not contain {1} node</value>
+    <comment>{0} represents the path to a solution test settings file. {1} represents the non-localized name of an XML node.</comment>
+  </data>
+  <data name="String1" xml:space="preserve">
+    <value />
+    <comment>{0} represents the path to a solution test settings file. {1} represents a textual summary of an exception, likely non-localized.</comment>
+  </data>
   <data name="TestDiscoveryStarting" xml:space="preserve">
     <value>Google Test Adapter: Test discovery starting...</value>
   </data>
diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs
index 42c4d4f59..ff0a33157 100644
--- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs
+++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs
@@ -60,6 +60,16 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Solution test settings file could not be parsed, check file: {0}
+        ///Exception: {1}.
+        /// </summary>
+        public static string CantParseSettings {
+            get {
+                return ResourceManager.GetString("CantParseSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enables Visual Studio&apos;s testing tools with unit tests written for Google Test..
         /// </summary>
@@ -78,6 +88,24 @@ public static string ExtensionName {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to RunSettingsDocument does not contain a RunSettings node! Canceling settings merging....
+        /// </summary>
+        public static string RunSettingsMissingNode {
+            get {
+                return ResourceManager.GetString("RunSettingsMissingNode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Solution test settings file found at &apos;{0}&apos;, but does not contain {1} node.
+        /// </summary>
+        public static string SolutionFoundButMissingNode {
+            get {
+                return ResourceManager.GetString("SolutionFoundButMissingNode", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test Adapter for Google Test: Test discovery starting....
         /// </summary>
diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx
index 41de6cb29..279c91399 100644
--- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx
+++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx
@@ -117,12 +117,24 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CantParseSettings" xml:space="preserve">
+    <value>Solution test settings file could not be parsed, check file: {0}
+Exception: {1}</value>
+    <comment>{0} represents the path to a solution test settings file. {1} represents a textual summary of an exception, likely non-localized.</comment>
+  </data>
   <data name="ExtensionDescription" xml:space="preserve">
     <value>Enables Visual Studio's testing tools with unit tests written for Google Test.</value>
   </data>
   <data name="ExtensionName" xml:space="preserve">
     <value>Test Adapter for Google Test</value>
   </data>
+  <data name="RunSettingsMissingNode" xml:space="preserve">
+    <value>RunSettingsDocument does not contain a RunSettings node! Canceling settings merging...</value>
+  </data>
+  <data name="SolutionFoundButMissingNode" xml:space="preserve">
+    <value>Solution test settings file found at '{0}', but does not contain {1} node</value>
+    <comment>{0} represents the path to a solution test settings file. {1} represents the non-localized name of an XML node.</comment>
+  </data>
   <data name="TestDiscoveryStarting" xml:space="preserve">
     <value>Test Adapter for Google Test: Test discovery starting...</value>
   </data>
diff --git a/GoogleTestAdapter/Common/Common.csproj b/GoogleTestAdapter/Common/Common.csproj
index 7a147b77e..c1836b820 100644
--- a/GoogleTestAdapter/Common/Common.csproj
+++ b/GoogleTestAdapter/Common/Common.csproj
@@ -57,7 +57,7 @@
     <Compile Include="LoggerBase.cs" />
     <Compile Include="ProcessWaiter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.cs" />
+    <Compile Include="CommonResources.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />
diff --git a/GoogleTestAdapter/Common/Resources.cs b/GoogleTestAdapter/Common/CommonResources.cs
similarity index 98%
rename from GoogleTestAdapter/Common/Resources.cs
rename to GoogleTestAdapter/Common/CommonResources.cs
index bc07d0c01..913b44045 100644
--- a/GoogleTestAdapter/Common/Resources.cs
+++ b/GoogleTestAdapter/Common/CommonResources.cs
@@ -6,7 +6,7 @@
     /// <summary>
     ///   Based on the auto-generated resources file from Common.Dynamic
     /// </summary>
-    public class Resources
+    public class CommonResources
     {
 
         private static global::System.Resources.ResourceManager resourceMan;
@@ -14,7 +14,7 @@ public class Resources
         private static global::System.Globalization.CultureInfo resourceCulture;
 
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
+        internal CommonResources()
         {
         }
 
diff --git a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs
index ecb429963..2150c248e 100644
--- a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs
+++ b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs
@@ -171,7 +171,7 @@ public static void LogExecutionError(ILogger logger, string executable, string w
         {
             logger.LogError(String.Format(Resources.RunExecutableError, threadName, executable, exception.Message));
             logger.DebugError(String.Format(Resources.StackTrace, threadName, Environment.NewLine, exception.StackTrace));
-            logger.LogError(String.Format(Common.Resources.TroubleShootingLink, threadName));
+            logger.LogError(String.Format(CommonResources.TroubleShootingLink, threadName));
             logger.LogError(String.Format(Resources.ExecuteSteps, threadName, workingDir, Environment.NewLine, executable, arguments));
         }
 
diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj
index e84816874..efb29a6f6 100644
--- a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj
+++ b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj
@@ -63,14 +63,6 @@
       <HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'GTA'">
-      <HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
-      <HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>$(NuGetPackages)Moq.4.5.30\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
@@ -95,7 +87,6 @@
   </Choose>
   <ItemGroup>
     <Compile Include="Settings\RunSettingsContainerTests.cs" />
-    <Compile Include="Helpers\RunSettingsServiceUnderTest.cs" />
     <Compile Include="TestExecutorTestsBase.cs" />
     <Compile Include="TestAdapterTestsBase.cs" />
     <Compile Include="Framework\DebuggedProcessLauncherTests.cs" />
@@ -108,7 +99,6 @@
     <Compile Include="TestExecutorSequentialTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings\RunSettingsProviderTests.cs" />
-    <Compile Include="Settings\RunSettingsServiceTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt
index 49677e154..821f7c294 100644
--- a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt
+++ b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt
@@ -8,10 +8,8 @@
   <package id="Moq" version="4.5.30" targetFramework="net452" />
 <# if (TestAdapterFlavor == "GTA") { #>
   <package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net452" />
 <# } else if (TestAdapterFlavor == "TAfGT") { #>
   <package id="Microsoft.TestPlatform.ObjectModel" version="15.0.0" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net46" />
 <# } #>
   <package id="OpenCover" version="4.7.922" targetFramework="net452" />
-</packages>
\ No newline at end of file
+</packages>
diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj
index 4a2be1911..e4e2769e7 100644
--- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj
+++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj
@@ -144,14 +144,6 @@
       <HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'GTA'">
-      <HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
-      <HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath Condition="'$(TestAdapterFlavor)' == 'GTA'">$(NuGetPackages)VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
       <Private>True</Private>
@@ -212,7 +204,6 @@
     <Compile Include="Settings\IGlobalRunSettingsInternal.cs" />
     <Compile Include="Settings\RunSettingsContainer.cs" />
     <Compile Include="Settings\RunSettingsProvider.cs" />
-    <Compile Include="Settings\RunSettingsService.cs" />
     <Compile Include="Settings\TestPropertySettings.cs" />
     <Compile Include="Settings\TestPropertySettingsContainer.cs" />
     <Compile Include="Settings\TestPropertySettingsProvider.cs" />
diff --git a/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs b/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs
index e7dd5bfb0..4dfef1789 100644
--- a/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs
+++ b/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs
@@ -46,7 +46,7 @@ public void DiscoverTests(IEnumerable<string> executables, IDiscoveryContext dis
                 return;
             CommonFunctions.LogVisualStudioVersion(_logger);
 
-            _logger.LogInfo(Common.Resources.TestDiscoveryStarting);
+            _logger.LogInfo(CommonResources.TestDiscoveryStarting);
             _logger.DebugInfo(String.Format(Resources.Settings, _settings));
 
             try
@@ -71,10 +71,10 @@ private bool IsSupportedVisualStudioVersion()
             switch (version)
             {
                 case VsVersion.Unknown:
-                    _logger.LogWarning(String.Format(Resources.IdentifyVSError, Common.Resources.ExtensionName));
+                    _logger.LogWarning(String.Format(Resources.IdentifyVSError, CommonResources.ExtensionName));
                     return true;
                 case VsVersion.VS2012:
-                    _logger.LogError(String.Format(Resources.VS2012Error, Common.Resources.ExtensionName));
+                    _logger.LogError(String.Format(Resources.VS2012Error, CommonResources.ExtensionName));
                     return false;
                 default:
                     return true;
diff --git a/GoogleTestAdapter/TestAdapter/TestExecutor.cs b/GoogleTestAdapter/TestAdapter/TestExecutor.cs
index dec15155e..e214cd8d8 100644
--- a/GoogleTestAdapter/TestAdapter/TestExecutor.cs
+++ b/GoogleTestAdapter/TestAdapter/TestExecutor.cs
@@ -133,7 +133,7 @@ private Stopwatch StartStopWatchAndInitEnvironment(IRunContext runContext, IFram
 
             CommonFunctions.LogVisualStudioVersion(_logger);
 
-            _logger.LogInfo(Common.Resources.TestExecutionStarting);
+            _logger.LogInfo(CommonResources.TestExecutionStarting);
             _logger.DebugInfo(String.Format(Resources.Settings, _settings));
 
             return stopwatch;
diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt
index e0bb10aa1..b42060716 100644
--- a/GoogleTestAdapter/TestAdapter/packages.config.tt
+++ b/GoogleTestAdapter/TestAdapter/packages.config.tt
@@ -5,7 +5,6 @@
 <packages>
 <# if (TestAdapterFlavor == "GTA") { #>
   <package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net45" />
-  <package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net45" />
   <package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
   <package id="VSSDK.DTE.10" version="10.0.4" targetFramework="net45" />
   <package id="VSSDK.DTE.8" version="8.0.4" targetFramework="net45" />
@@ -31,6 +30,5 @@
   <package id="VSSDK.TextManager.Interop.9" version="9.0.4" targetFramework="net45" />
 <# } else if (TestAdapterFlavor == "TAfGT") { #>
   <package id="Microsoft.TestPlatform.ObjectModel" version="15.0.0" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net46" />
 <# } #>
-</packages>
\ No newline at end of file
+</packages>
diff --git a/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Helpers/RunSettingsServiceUnderTest.cs
similarity index 92%
rename from GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs
rename to GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Helpers/RunSettingsServiceUnderTest.cs
index 275b77c19..bff7c3c5a 100644
--- a/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs
+++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Helpers/RunSettingsServiceUnderTest.cs
@@ -1,6 +1,6 @@
 using GoogleTestAdapter.TestAdapter.Settings;
 
-namespace GoogleTestAdapter.TestAdapter.Helpers
+namespace GoogleTestAdapter.VsPackage.Helpers
 {
     public class RunSettingsServiceUnderTest : RunSettingsService
     {
diff --git a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Settings/RunSettingsServiceTests.cs
similarity index 99%
rename from GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs
rename to GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Settings/RunSettingsServiceTests.cs
index 773567c89..66acfbc1e 100644
--- a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs
+++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Settings/RunSettingsServiceTests.cs
@@ -7,8 +7,9 @@
 using System.Xml.XPath;
 using FluentAssertions;
 using GoogleTestAdapter.Settings;
-using GoogleTestAdapter.TestAdapter.Helpers;
+using GoogleTestAdapter.TestAdapter.Settings;
 using GoogleTestAdapter.Tests.Common;
+using GoogleTestAdapter.VsPackage.Helpers;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestWindow.Extensibility;
@@ -16,7 +17,7 @@
 using static GoogleTestAdapter.Tests.Common.TestMetadata.TestCategories;
 // ReSharper disable PossibleNullReferenceException
 
-namespace GoogleTestAdapter.TestAdapter.Settings
+namespace GoogleTestAdapter.VsPackage.Settings
 {
 
     [TestClass]
diff --git a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj
index 2b3a43e10..6cc7f139d 100644
--- a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj
+++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj
@@ -53,6 +53,12 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>$(NuGetPackages)Moq.4.5.30\lib\net45\Moq.dll</HintPath>
     </Reference>
@@ -76,9 +82,11 @@
   <ItemGroup>
     <Compile Include="Debugging\MessageBasedDebuggerAttacherTests.cs" />
     <Compile Include="Debugging\DebuggerAttacherServiceTests.cs" />
+    <Compile Include="Helpers\RunSettingsServiceUnderTest.cs" />
     <Compile Include="ReleaseNotes\HistoryTests.cs" />
     <Compile Include="ReleaseNotes\ReleaseNotesCreatorTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Settings\RunSettingsServiceTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj">
@@ -105,7 +113,9 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Key.snk" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
diff --git a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config
index fe8e4fd7c..0c2db86b4 100644
--- a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config
+++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config
@@ -2,5 +2,7 @@
 <packages>
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
   <package id="FluentAssertions" version="4.19.0" targetFramework="net45" />
+  <package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net45" />
   <package id="Moq" version="4.5.30" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
index 3f6da46b6..4f32cefeb 100644
--- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
+++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
@@ -279,6 +279,10 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common.Dynamic.GTA\Common.Dynamic.GTA.csproj">
+      <Project>{17f4b73f-e4d3-4e40-98fc-788b1d0f8225}</Project>
+      <Name>Common.Dynamic.GTA</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Common\Common.csproj">
       <Project>{bc05d210-68cd-47d0-ae8c-0f3168d1be73}</Project>
       <Name>Common</Name>
diff --git a/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs b/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs
index a40c39076..35a44d683 100644
--- a/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs
+++ b/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs
@@ -2,7 +2,6 @@
 
 using System;
 using GoogleTestAdapter.Common;
-using GoogleTestAdapter.Settings;
 using Microsoft.VisualStudio.Shell.Interop;
 
 namespace GoogleTestAdapter.VsPackage.Helpers
diff --git a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs
similarity index 93%
rename from GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs
rename to GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs
index 7aae9a108..7dea8596a 100644
--- a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs
+++ b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs
@@ -1,4 +1,4 @@
-// This file has been modified by Microsoft on 9/2017.
+// This file has been modified by Microsoft on 1/2021.
 
 using EnvDTE;
 using GoogleTestAdapter.Settings;
@@ -37,7 +37,7 @@ public IXPathNavigable AddRunSettings(IXPathNavigable runSettingDocument,
             Debug.Assert(runSettingsNavigator != null, "userRunSettingsNavigator == null!");
             if (!runSettingsNavigator.MoveToChild(Constants.RunSettingsName, ""))
             {
-                logger.Log(MessageLevel.Warning, Resources.RunSettingsMissingNode);
+                logger.Log(MessageLevel.Warning, Common.Resources.RunSettingsMissingNode);
                 return runSettingsNavigator;
             }
 
@@ -72,7 +72,7 @@ public IXPathNavigable AddRunSettings(IXPathNavigable runSettingDocument,
                         }
                         else
                         {
-                            logger.Log(MessageLevel.Warning, string.Format(Resources.SolutionFoundButMissingNode, solutionRunSettingsFile, Constants.RunSettingsName));
+                            logger.Log(MessageLevel.Warning, string.Format(Common.Resources.SolutionFoundButMissingNode, solutionRunSettingsFile, Constants.RunSettingsName));
                         }
 		    }
                 }
@@ -80,7 +80,7 @@ public IXPathNavigable AddRunSettings(IXPathNavigable runSettingDocument,
             catch (Exception e)
             {
                 logger.Log(MessageLevel.Warning,
-                    string.Format(Resources.CantParseSettings, solutionRunSettingsFile, e));
+                    string.Format(Common.Resources.CantParseSettings, solutionRunSettingsFile, e));
             }
 
             foreach (var projectSettings in settingsContainer.ProjectSettings)
diff --git a/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems b/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems
index ba789921c..2a0bbae4f 100644
--- a/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems
+++ b/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems
@@ -34,6 +34,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)OptionsPages\ParallelizationOptionsDialogPage.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Settings\RunSettingsService.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="$(MSBuildThisFileDirectory)..\Resources\Icons\Icon.ico" />
diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj
index af7f25e49..bf7396a67 100644
--- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj
+++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj
@@ -189,7 +189,7 @@
       <HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -237,6 +237,10 @@
     </SignFilesDependsOn>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common.Dynamic.TAfGT\Common.Dynamic.TAfGT.csproj">
+      <Project>{9041bded-fa1b-4c17-b7ea-7b750c470c23}</Project>
+      <Name>Common.Dynamic.TAfGT</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Common\Common.csproj">
       <Project>{bc05d210-68cd-47d0-ae8c-0f3168d1be73}</Project>
       <Name>Common</Name>