diff --git a/AgileSQLClub.tSQLtTestController/AgileSQLClub.tSQLtTestController.csproj b/AgileSQLClub.tSQLtTestController/AgileSQLClub.tSQLtTestController.csproj
index 01dcb4f..50f2832 100644
--- a/AgileSQLClub.tSQLtTestController/AgileSQLClub.tSQLtTestController.csproj
+++ b/AgileSQLClub.tSQLtTestController/AgileSQLClub.tSQLtTestController.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AgileSQLClub.tSQLtTestController</RootNamespace>
     <AssemblyName>AgileSQLClub.tSQLtTestController</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -62,7 +62,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestWindow.Core">
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -103,9 +103,6 @@
     </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>C:\"Program Files (x86)"\"Windows Kits"\10\bin\x64\signtool.exe sign /t "http://timestamp.globalsign.com/scripts/timstamp.dll"  $(TargetPath)</PostBuildEvent>
-  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/AgileSQLClub.tSQLtTestController/Properties/Settings.Designer.cs b/AgileSQLClub.tSQLtTestController/Properties/Settings.Designer.cs
index a6ce6f8..aff2d5b 100644
--- a/AgileSQLClub.tSQLtTestController/Properties/Settings.Designer.cs
+++ b/AgileSQLClub.tSQLtTestController/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AgileSQLClub.tSQLtTestController.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/AgileSQLClub.tSQLtTestController/TestClass.cs b/AgileSQLClub.tSQLtTestController/TestClass.cs
index e070c42..3553c25 100644
--- a/AgileSQLClub.tSQLtTestController/TestClass.cs
+++ b/AgileSQLClub.tSQLtTestController/TestClass.cs
@@ -10,12 +10,17 @@ public class FileScanner
     {
         private readonly TSqlParser _parser;
 
+        public FileScanner()
+        {
+            _parser = new TSql130Parser(true);
+        }
+
         public FileScanner(TSqlParser parser)
         {
             _parser = parser;
         }
 
-        public ScanResults ScanCode(string code, ScanResults results, string path)
+        public virtual ScanResults ScanCode(string code, ScanResults results, string path)
         {
             var batches = code.Split(new[] {"\r\nGO\r\n", "\nGO\n"}, StringSplitOptions.None);
             var offset = 0;
diff --git a/Test/UnitTests/TestCacheTests.cs b/Test/UnitTests/TestCacheTests.cs
new file mode 100644
index 0000000..3857640
--- /dev/null
+++ b/Test/UnitTests/TestCacheTests.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AgileSQLClub.tSQLtTestController;
+using Moq;
+using NUnit.Framework;
+using tSQLtTestAdapter;
+
+namespace UnitTests
+{
+    [TestFixture]
+    public class TestCacheTests
+    {
+        [Test]
+        public void DiscardsDuplicates()
+        {
+            var mockScanner = new Mock<FileScanner>();
+            
+            mockScanner.Setup(p => p.ScanCode(It.IsAny<string>(), It.IsAny<ScanResults>(), It.IsAny<string>())).Returns((
+                string a, ScanResults result, string b) =>
+            {
+                result.FoundClasses.Add(new SqlSchema("Schema", "PathA"));
+                result.FoundClasses.Add(new SqlSchema("Schema", "PathB"));
+                result.FoundClasses.Add(new SqlSchema("Schema", "PathB"));
+
+                result.FoundPotentialTests.Add(new SqlProcedure(new SqlObjectName() {Object = "test", Schema = "Schema"}, "Patha", 0, 100, 1));
+                result.FoundPotentialTests.Add(new SqlProcedure(new SqlObjectName() { Object = "test", Schema = "Schema" }, "Pathb", 0, 100, 1));
+                return result;
+            });
+
+            var mockFileReader = new Mock<IFileReader>();
+            mockFileReader.Setup(p => p.ReadAll(It.IsAny<string>())).Returns("Blah");
+            mockFileReader.Setup(p => p.GetLastWriteTimeUtc(It.IsAny<string>())).Returns(DateTime.MaxValue);
+            
+            var testCache = new TestCache(mockScanner.Object, mockFileReader.Object);
+            testCache.AddPath("path");
+            Assert.AreEqual(1, testCache.GetTests().Count);
+        }
+    }
+}
diff --git a/Test/UnitTests/UnitTests.csproj b/Test/UnitTests/UnitTests.csproj
index eccf628..867ad93 100644
--- a/Test/UnitTests/UnitTests.csproj
+++ b/Test/UnitTests/UnitTests.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTests</RootNamespace>
     <AssemblyName>UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Data.Tools.Schema.Sql, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.SqlServer.DacFx.x64.130.3411.1\lib\net40\Microsoft.Data.Tools.Schema.Sql.dll</HintPath>
       <Private>True</Private>
@@ -54,6 +59,10 @@
       <HintPath>..\..\packages\Microsoft.SqlServer.DacFx.x64.130.3411.1\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Moq, Version=4.7.1.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.7.1\lib\net45\Moq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -69,6 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileScannerTests.cs" />
+    <Compile Include="TestCacheTests.cs" />
     <Compile Include="tSQLtTestFinderTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -80,6 +90,10 @@
       <Project>{35E9ACF7-2A97-4160-AB4E-42F4C4EA16CD}</Project>
       <Name>AgileSQLClub.tSQLtTestController</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\XmlTestAdapter\tSQLtTestAdapter.csproj">
+      <Project>{BC4B3BED-9241-4DD6-8070-A9B66DFC08C1}</Project>
+      <Name>tSQLtTestAdapter</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Test/UnitTests/packages.config b/Test/UnitTests/packages.config
index 8dd087c..3c51200 100644
--- a/Test/UnitTests/packages.config
+++ b/Test/UnitTests/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Castle.Core" version="4.0.0" targetFramework="net452" />
   <package id="Microsoft.SqlServer.DacFx.x64" version="130.3411.1" targetFramework="net452" />
+  <package id="Moq" version="4.7.1" targetFramework="net452" />
   <package id="NUnit" version="3.2.1" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/XMLTestAdapterVSIX/source.extension.vsixmanifest b/XMLTestAdapterVSIX/source.extension.vsixmanifest
index f806f87..d73042c 100644
--- a/XMLTestAdapterVSIX/source.extension.vsixmanifest
+++ b/XMLTestAdapterVSIX/source.extension.vsixmanifest
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="AgileSQLClub.tSQLtTestAdapter" Version="0.63" Language="en-US" Publisher="EdElliott" />
-    <DisplayName>tSQLt Test Adapter</DisplayName>
+    <Identity Id="AgileSQLClub.tSQLtTestAdapter15" Version="0.80" Language="en-US" Publisher="EdElliott" />
+    <DisplayName>tSQLt Test Adapter for Visual Studio 2017</DisplayName>
     <Description xml:space="preserve">Unit Test Adapter for tSQLt Tests</Description>
     <MoreInfo>https://the.agilsql.club/projects/tSQLt-Test-Adapter</MoreInfo>
     <License>LICENSE</License>
     <Tags>tSQLt, Test, Adapter</Tags>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0,15.0)" />
-    <InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
-    <InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
+
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Ultimate" />
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
   </Installation>
   <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.6" />
   </Dependencies>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="tSQLtTestAdapter" Path="|tSQLtTestAdapter|" />
     <Asset Type="UnitTestExtension" d:Source="Project" d:ProjectName="tSQLtTestAdapter" Path="|tSQLtTestAdapter|" />
     <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="AgileSQLClub.tSQLtTestController" Path="|AgileSQLClub.tSQLtTestController|" AssemblyName="|AgileSQLClub.tSQLtTestController;AssemblyName|" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" />
+  </Prerequisites>
 </PackageManifest>
\ No newline at end of file
diff --git a/XMLTestAdapterVSIX/tSQLtTestAdapterVSIX.csproj b/XMLTestAdapterVSIX/tSQLtTestAdapterVSIX.csproj
index 646c3bf..5901e42 100644
--- a/XMLTestAdapterVSIX/tSQLtTestAdapterVSIX.csproj
+++ b/XMLTestAdapterVSIX/tSQLtTestAdapterVSIX.csproj
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <OldToolsVersion>12.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -22,7 +22,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>tSQLtTestAdapterVSIX</RootNamespace>
     <AssemblyName>tSQLtTestAdapter</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
diff --git a/XmlTestAdapter/Helpers/RunSettings.cs b/XmlTestAdapter/Helpers/RunSettings.cs
index 1e53947..4de30a5 100644
--- a/XmlTestAdapter/Helpers/RunSettings.cs
+++ b/XmlTestAdapter/Helpers/RunSettings.cs
@@ -6,6 +6,7 @@
 using System.Xml.Linq;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
+
 namespace tSQLtTestAdapter.Helpers
 {
     class RunSettings
diff --git a/XmlTestAdapter/Helpers/SolutionEventsListener.cs b/XmlTestAdapter/Helpers/SolutionEventsListener.cs
index 66b33e8..ac2949f 100644
--- a/XmlTestAdapter/Helpers/SolutionEventsListener.cs
+++ b/XmlTestAdapter/Helpers/SolutionEventsListener.cs
@@ -1,13 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
 
 namespace tSQLtTestAdapter.Helpers
 {
-	[Export(typeof(ISolutionEventsListener))]
+  
+    [Export(typeof(ISolutionEventsListener))]
     public class SolutionEventsListener : IVsSolutionEvents, ISolutionEventsListener
     {
         private readonly IVsSolution solution;
@@ -23,7 +25,8 @@ public class SolutionEventsListener : IVsSolutionEvents, ISolutionEventsListener
         [ImportingConstructor]
         public SolutionEventsListener([Import(typeof(SVsServiceProvider))]IServiceProvider serviceProvider)
         {
-            ValidateArg.NotNull(serviceProvider, "serviceProvider");
+            //Has been made internal in 2017 agghhhhh!
+//            ValidateArg.NotNull(serviceProvider, "serviceProvider");
             this.solution = serviceProvider.GetService(typeof(SVsSolution)) as IVsSolution;
         }
 
diff --git a/XmlTestAdapter/Helpers/TestFileAddRemoveListener.cs b/XmlTestAdapter/Helpers/TestFileAddRemoveListener.cs
index e1d8b25..13932c6 100644
--- a/XmlTestAdapter/Helpers/TestFileAddRemoveListener.cs
+++ b/XmlTestAdapter/Helpers/TestFileAddRemoveListener.cs
@@ -3,7 +3,7 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
 
 namespace tSQLtTestAdapter.Helpers
 {
@@ -18,7 +18,7 @@ public sealed class TestFileAddRemoveListener : IVsTrackProjectDocumentsEvents2,
         [ImportingConstructor]
         public TestFileAddRemoveListener([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
         {
-            ValidateArg.NotNull(serviceProvider, "serviceProvider");
+           // ValidateArg.NotNull(serviceProvider, "serviceProvider");
 
             projectDocTracker = serviceProvider.GetService(typeof(SVsTrackProjectDocuments)) as IVsTrackProjectDocuments2;
         }
diff --git a/XmlTestAdapter/Helpers/TestFilesUpdateWatcher.cs b/XmlTestAdapter/Helpers/TestFilesUpdateWatcher.cs
index 2c6e3a5..19f44e5 100644
--- a/XmlTestAdapter/Helpers/TestFilesUpdateWatcher.cs
+++ b/XmlTestAdapter/Helpers/TestFilesUpdateWatcher.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Windows.Forms;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace tSQLtTestAdapter.Helpers
 {
@@ -32,7 +31,7 @@ public TestFilesUpdateWatcher()
 
         public void AddWatch(string path)
         {
-            ValidateArg.NotNullOrEmpty(path, "path");
+            //ValidateArg.NotNullOrEmpty(path, "path");
 
             if (!String.IsNullOrEmpty(path))
             {
@@ -63,7 +62,7 @@ public void AddWatch(string path)
 
         public void RemoveWatch(string path)
         {
-            ValidateArg.NotNullOrEmpty(path, "path");
+            //ValidateArg.NotNullOrEmpty(path, "path");
 
             if (!String.IsNullOrEmpty(path))
             {
diff --git a/XmlTestAdapter/IFileReader.cs b/XmlTestAdapter/IFileReader.cs
new file mode 100644
index 0000000..0cd499c
--- /dev/null
+++ b/XmlTestAdapter/IFileReader.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace tSQLtTestAdapter
+{
+    public interface IFileReader
+    {
+        DateTime GetLastWriteTimeUtc(string path);
+        string ReadAll(string path);
+    }
+}
\ No newline at end of file
diff --git a/XmlTestAdapter/Properties/AssemblyInfo.cs b/XmlTestAdapter/Properties/AssemblyInfo.cs
index 4757c41..5846493 100644
--- a/XmlTestAdapter/Properties/AssemblyInfo.cs
+++ b/XmlTestAdapter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")] 
-[assembly: AssemblyVersion("0.0.0.2")]
-[assembly: AssemblyFileVersion("0.0.0.2")]
+[assembly: AssemblyVersion("0.0.0.3")]
+[assembly: AssemblyFileVersion("0.0.0.3")]
diff --git a/XmlTestAdapter/TestCache.cs b/XmlTestAdapter/TestCache.cs
index 59b6371..8b1d332 100644
--- a/XmlTestAdapter/TestCache.cs
+++ b/XmlTestAdapter/TestCache.cs
@@ -12,16 +12,28 @@ public class TestCache
         private readonly Dictionary<string, DateTime> _dateCache = new Dictionary<string, DateTime>();
         private bool _haveChanges = true;
         private ScanResults _results = new ScanResults();
-        private readonly FileScanner _scanner = new FileScanner(new TSql130Parser(false));
+        private readonly FileScanner _scanner;
         private readonly List<TestClass> _tests = new List<TestClass>();
+        private readonly IFileReader _fileReader;
+        public TestCache()
+        {
+            _scanner = new FileScanner(new TSql130Parser(false));
+            _fileReader = new FileReader();
+        }
+
+        public TestCache(FileScanner probablyAMock, IFileReader anotherMock)
+        {
+            _scanner = probablyAMock;
+            _fileReader = anotherMock;
+        }
 
 
         public void AddPath(string path)
         {
-            var date = File.GetLastWriteTimeUtc(path);
+            var date = _fileReader.GetLastWriteTimeUtc(path);
             if (!_dateCache.ContainsKey(path) || date <= _dateCache[path])
             {
-                _results = _scanner.ScanCode(File.ReadAllText(path), _results, path);
+                _results = _scanner.ScanCode(_fileReader.ReadAll(path), _results, path);
                 _haveChanges = true;
             }
         }
@@ -32,14 +44,21 @@ public List<TestClass> GetTests()
             {
                 return _tests;
             }
-
-            var classes = new List<TestClass>();
             
-            var foundClasses =
+            var foundClasses = new List<SqlSchema>();
+
+            foreach (var clazz in 
                 _results.FoundClasses.Where(
                     p =>
                         _results.FoundPotentialTests.Any(
-                            e => string.Equals(p.Name, e.Name.Schema, StringComparison.OrdinalIgnoreCase)));
+                            e => string.Equals(p.Name, e.Name.Schema, StringComparison.OrdinalIgnoreCase))))
+            {
+                if (foundClasses.All(p => p.Name != clazz.Name))
+                {
+                    foundClasses.Add(clazz);
+                }
+
+            }
 
             var foundTests =
                 _results.FoundPotentialTests.Where(
@@ -54,7 +73,7 @@ public List<TestClass> GetTests()
                 var testClass = new TestClass();
                 testClass.Name = cls.Name;
                 testClass.Path = cls.Path;
-                //testClass.Tests =
+                
                 foreach (var test in foundTests.Where(p => string.Equals(p.Name.Schema, cls.Name, StringComparison.OrdinalIgnoreCase)))
                 {
                     testClass.Tests.Add(new Test {Name = test.Name.Object, Path = test.Path, Line = test.StartLine});
@@ -70,4 +89,23 @@ public List<TestClass> GetTests()
             return _tests;
         }
     }
+
+    public class FileReader : IFileReader
+    {
+        public FileReader()
+        {
+            
+        }
+
+
+        public virtual string ReadAll(string path)
+        {
+            return File.ReadAllText(path);
+        }
+
+        public virtual DateTime GetLastWriteTimeUtc(string path)
+        {
+            return File.GetLastWriteTimeUtc(path);
+        }
+    }
 }
\ No newline at end of file
diff --git a/XmlTestAdapter/tSQLtTestAdapter.csproj b/XmlTestAdapter/tSQLtTestAdapter.csproj
index 57ed935..568774e 100644
--- a/XmlTestAdapter/tSQLtTestAdapter.csproj
+++ b/XmlTestAdapter/tSQLtTestAdapter.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>tSQLtTestAdapter</RootNamespace>
     <AssemblyName>tSQLt.TestAdapter</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -65,22 +65,45 @@
       <HintPath>..\packages\Microsoft.SqlServer.DacFx.x64.130.3411.1\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow">
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Core">
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces">
-      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestWindow, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestWindow.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -106,6 +129,7 @@
     <Compile Include="Helpers\TestFileChangedEventArgs.cs" />
     <Compile Include="Helpers\TestFilesUpdateWatcher.cs" />
     <Compile Include="Helpers\VsSolutionHelper.cs" />
+    <Compile Include="IFileReader.cs" />
     <Compile Include="TestCache.cs" />
     <Compile Include="tSQLtTestContainer.cs" />
     <Compile Include="tSQLtTestContainerDiscoverer.cs" />
@@ -123,9 +147,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <PostBuildEvent>C:\"Program Files (x86)"\"Windows Kits"\10\bin\x64\signtool.exe sign /t "http://timestamp.globalsign.com/scripts/timstamp.dll"  $(TargetPath)</PostBuildEvent>
-  </PropertyGroup>
+  </PropertyGroup>-->
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/XmlTestAdapter/tSQLtTestContainerDiscoverer.cs b/XmlTestAdapter/tSQLtTestContainerDiscoverer.cs
index 884e220..49c8736 100644
--- a/XmlTestAdapter/tSQLtTestContainerDiscoverer.cs
+++ b/XmlTestAdapter/tSQLtTestContainerDiscoverer.cs
@@ -9,6 +9,20 @@
 using Microsoft.VisualStudio.TestWindow.Extensibility;
 using tSQLtTestAdapter.Helpers;
 
+/*
+ * I *think* I need this because the tests are not in a dll or exe - to enumerate tests in a diffrent file format needs 
+ *  this, as per bruno's semi-cryptic comment on "https://blogs.msdn.microsoft.com/bhuvaneshwari/2012/03/13/authoring-a-new-visual-studio-unit-test-adapter/"
+ *  
+ *  BrunoLM
+        August 22, 2013 at 12:43 pm
+        For non .exe and .dll you need these interfaces as well ITestContainerDiscoverer and ITestContainer
+
+        Example
+
+        github.com/…/TSTestExtension
+ 
+ */
+
 namespace tSQLtTestAdapter
 {
     [Export(typeof(ITestContainerDiscoverer))]
diff --git a/tSQLtTestAdapter.sln b/tSQLtTestAdapter.sln
index 8be2f8c..07efd15 100644
--- a/tSQLtTestAdapter.sln
+++ b/tSQLtTestAdapter.sln
@@ -1,16 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Test", ".Test", "{F47BAB61-C106-466B-9284-94FDB36CD6A5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tSQLtTestAdapter", "XmlTestAdapter\tSQLtTestAdapter.csproj", "{BC4B3BED-9241-4DD6-8070-A9B66DFC08C1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tSQLtTestAdapterVSIX", "XMLTestAdapterVSIX\tSQLtTestAdapterVSIX.csproj", "{D519F9EB-22F8-4054-A039-EDE0EFA6F025}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgileSQLClub.tSQLtTestController", "AgileSQLClub.tSQLtTestController\AgileSQLClub.tSQLtTestController.csproj", "{35E9ACF7-2A97-4160-AB4E-42F4C4EA16CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Test", ".Test", "{F47BAB61-C106-466B-9284-94FDB36CD6A5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "Test\UnitTests\UnitTests.csproj", "{46F2E446-C152-4A6B-934C-027B03DF048A}"
 EndProject
 Global