diff --git a/.gitignore b/.gitignore
index 4abf462f0..ae5c93b8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,11 @@
 /tSQLtCLR/tSQLtExternalAccessKey/bin
 /tSQLtCLR/tSQLtExternalAccessKey/obj
 /tSQLtCLR/tSQLtCLR.v12.suo
+*.dtbcache
+*.suo
+/tSQLtCLR/builderr.txt
+/tSQLtCLR/buildlog.txt
+/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/db.lock
+/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide
+/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide-shm
+/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide-wal
diff --git a/Build/Build.ssmssqlproj b/Build/Build.ssmssqlproj
index 1b3f50895..a18b2220d 100644
--- a/Build/Build.ssmssqlproj
+++ b/Build/Build.ssmssqlproj
@@ -3,7 +3,7 @@
   <Items>
     <LogicalFolder Name="Connections" Type="2" Sorted="true">
       <Items>
-        <ConnectionNode Name="Dev_2014:MacWin7A\meinse00">
+        <ConnectionNode Name="Dev_2014:WIN10A\meinse00">
           <Created>2014-12-31T18:06:01.9272147-05:00</Created>
           <Type>SQL</Type>
           <Server>Dev_2014</Server>
@@ -15,7 +15,7 @@
           <ConnectionProtocol>NotSpecified</ConnectionProtocol>
           <ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
         </ConnectionNode>
-        <ConnectionNode Name="Dev_tSQLt:MacWin7A\meinse00">
+        <ConnectionNode Name="Dev_tSQLt:WIN10A\meinse00">
           <Created>2014-11-24T18:10:21.4587287-05:00</Created>
           <Type>SQL</Type>
           <Server>Dev_tSQLt</Server>
@@ -115,6 +115,12 @@
           <AssociatedConnUserName />
           <FullPath>Install(tSQLtExternalAccessKey).sql</FullPath>
         </FileNode>
+        <FileNode Name="PrintVersionInfo.sql">
+          <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
+          <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
+          <AssociatedConnUserName />
+          <FullPath>PrintVersionInfo.sql</FullPath>
+        </FileNode>
       </Items>
     </LogicalFolder>
     <LogicalFolder Name="Miscellaneous" Type="3" Sorted="true">
@@ -137,6 +143,12 @@
           <AssociatedConnUserName />
           <FullPath>CreateAssemblyGenerator.exe</FullPath>
         </FileNode>
+        <FileNode Name="Install the tSQLt build.docx">
+          <AssociatedConnectionMoniker />
+          <AssociatedConnSrvName />
+          <AssociatedConnUserName />
+          <FullPath>Install the tSQLt build.docx</FullPath>
+        </FileNode>
         <FileNode Name="License.txt">
           <AssociatedConnectionMoniker />
           <AssociatedConnSrvName />
@@ -191,12 +203,42 @@
           <AssociatedConnUserName />
           <FullPath>SqlLoginNbuild.bat</FullPath>
         </FileNode>
+        <FileNode Name="tSQLt.build.xml">
+          <AssociatedConnectionMoniker />
+          <AssociatedConnSrvName />
+          <AssociatedConnUserName />
+          <FullPath>tSQLt.build.xml</FullPath>
+        </FileNode>
+        <FileNode Name="tSQLt.buildCLR.xml">
+          <AssociatedConnectionMoniker />
+          <AssociatedConnSrvName />
+          <AssociatedConnUserName />
+          <FullPath>tSQLt.buildCLR.xml</FullPath>
+        </FileNode>
+        <FileNode Name="tSQLt.copybuild.xml">
+          <AssociatedConnectionMoniker />
+          <AssociatedConnSrvName />
+          <AssociatedConnUserName />
+          <FullPath>tSQLt.copybuild.xml</FullPath>
+        </FileNode>
+        <FileNode Name="tSQLt.experiments.build.xml">
+          <AssociatedConnectionMoniker />
+          <AssociatedConnSrvName />
+          <AssociatedConnUserName />
+          <FullPath>tSQLt.experiments.build.xml</FullPath>
+        </FileNode>
         <FileNode Name="tSQLt.local_build_output.build">
           <AssociatedConnectionMoniker />
           <AssociatedConnSrvName />
           <AssociatedConnUserName />
           <FullPath>tSQLt.local_build_output.build</FullPath>
         </FileNode>
+        <FileNode Name="tSQLt.validatebuild.xml">
+          <AssociatedConnectionMoniker />
+          <AssociatedConnSrvName />
+          <AssociatedConnUserName />
+          <FullPath>tSQLt.validatebuild.xml</FullPath>
+        </FileNode>
         <FileNode Name="VersionInfo.vbs">
           <AssociatedConnectionMoniker />
           <AssociatedConnSrvName />
diff --git a/Build/CreateAssemblyGenerator.exe b/Build/CreateAssemblyGenerator.exe
index 212a5dfb5..b48385a8b 100644
Binary files a/Build/CreateAssemblyGenerator.exe and b/Build/CreateAssemblyGenerator.exe differ
diff --git a/Build/Install the tSQLt build.docx b/Build/Install the tSQLt build.docx
new file mode 100644
index 000000000..1b949123f
Binary files /dev/null and b/Build/Install the tSQLt build.docx differ
diff --git a/Build/LocalBuild.bat b/Build/LocalBuild.bat
index 722c6bdc3..5e8d76ee2 100644
--- a/Build/LocalBuild.bat
+++ b/Build/LocalBuild.bat
@@ -1 +1,38 @@
-cmd /C %1\bin\ant -Dmsbuild.path=%2 -Ddb.server=%3 -Ddb.name=%4 %5
+@ECHO OFF
+
+REM CALL %1\bin\ant -buildfile Build\tSQLt.experiments.build.xml -Dmsbuild.path=%2 -verbose || goto :error
+REM goto :EOF
+
+ECHO +-------------------------+
+ECHO : Starting CLR BUILD      :
+ECHO +-------------------------+
+CALL %1\bin\ant -buildfile Build\tSQLt.buildCLR.xml -Dmsbuild.path=%2 || goto :error
+
+ECHO +-------------------------+
+ECHO : Starting tSQLt BUILD    :
+ECHO +-------------------------+
+CALL %1\bin\ant -buildfile Build\tSQLt.build.xml || goto :error
+
+ECHO +-------------------------+
+ECHO : Copying BUILD           :
+ECHO +-------------------------+
+ECHO :- THIS STEP IS OPTIONAL -:
+ECHO +-------------------------+
+CALL %1\bin\ant -buildfile Build\tSQLt.copybuild.xml || goto :error
+
+ECHO +-------------------------+
+ECHO : Validating BUILD        :
+ECHO +-------------------------+
+CALL %1\bin\ant -buildfile Build\tSQLt.validatebuild.xml -Ddb.version=%3 -Ddb.server=%4 -Ddb.name=%5 || goto :error
+
+ECHO +-------------------------+
+ECHO :     BUILD SUCCEEDED     :
+ECHO +-------------------------+
+goto :EOF
+
+:error
+ECHO +-------------------------+
+ECHO :  !!! BUILD FAILED !!!   :
+ECHO +-------------------------+
+exit /b %errorlevel%
+
diff --git a/Build/PrintVersionInfo.sql b/Build/PrintVersionInfo.sql
new file mode 100644
index 000000000..0913d3242
--- /dev/null
+++ b/Build/PrintVersionInfo.sql
@@ -0,0 +1,17 @@
+DECLARE @txt NVARCHAR(MAX);
+IF(OBJECT_ID('tempdb..#VersionInfoTable')IS NOT NULL)DROP TABLE #VersionInfoTable;
+SELECT Version, ClrVersion, ClrSigningKey INTO #VersionInfoTable FROM tSQLt.Info();
+EXEC tSQLt.TableToText @txt = @txt OUTPUT, @TableName = N'#VersionInfoTable';
+
+RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
+RAISERROR('|                                             tSQLt Info:                                             |',0,1)WITH NOWAIT;
+RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
+RAISERROR('',0,1)WITH NOWAIT;
+RAISERROR(@txt,0,1)WITH NOWAIT;
+RAISERROR('',0,1)WITH NOWAIT;
+RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
+RAISERROR('|                                          SQL Server Info:                                           |',0,1)WITH NOWAIT;
+RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
+RAISERROR('',0,1)WITH NOWAIT;
+RAISERROR('%s',0,1,@@VERSION)WITH NOWAIT;
+RAISERROR('-------------------------------------------------------------------------------------------------------',0,1)WITH NOWAIT;
diff --git a/Build/Setup.bat b/Build/Setup.bat
index 6578dfad7..4e89f14c5 100644
--- a/Build/Setup.bat
+++ b/Build/Setup.bat
@@ -2,7 +2,8 @@
 IF "%~1"=="" GOTO :Usage
 
 CD /d %~p0
-sqlcmd -S %1 -E -I -d master -i "ExecuteAsSA.sql" "tSQLtKey.sql" "Create(tSQLtKey).sql" "CreateLogin(tSQLt.Build).sql"  -V11
+REM sqlcmd -S %1 -E -I -d master -i "ExecuteAsSA.sql" "tSQLtKey.sql" "Create(tSQLtKey).sql" "CreateLogin(tSQLt.Build).sql"  -V11
+sqlcmd -S %1 -E -I -d master -i "CreateLogin(tSQLt.Build).sql"  -V11
 GOTO :EOF
 
 :Usage
diff --git a/Build/Version.txt b/Build/Version.txt
new file mode 100644
index 000000000..c29253f28
--- /dev/null
+++ b/Build/Version.txt
@@ -0,0 +1 @@
+1.0.7093.9172
diff --git a/Build/tSQLt.build.xml b/Build/tSQLt.build.xml
new file mode 100644
index 000000000..b39bd865a
--- /dev/null
+++ b/Build/tSQLt.build.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+<project name="tSQLt" default="all" basedir=".">
+ <description>Build tSQLt</description>
+ <target name="clean" description="remove all generated files">
+  <echo message="${msbuild.path}" />
+  <echo message="${db.server}" />
+  <echo message="${db.name}" />
+ </target>
+
+ <target
+   name="all"
+   depends="package.create.tSQLt, package.create.SQLPromptSnippets, package.create.tSQLt.tests, teamcity"
+   />
+
+ <target
+   name="package.create.tSQLt"
+   depends="init, init.tSQLtCLR, package.copy.files, package.construct.tsqlt, package.set.build.version, package.create.example, package.create.artifacts"
+   />
+
+ <target
+  name="package.create.tSQLt.tests"
+  depends="init, init.tSQLt.tests, package.test.files, package.test.create.artifacts"
+   />
+
+ <target
+   name="package.create.SQLPromptSnippets"
+   depends="init, init.SQLPromptSnippets, package.SQLPromptSnippets.copy, package.SQLPromptSnippets.create.artifacts"
+   />
+
+ <!--=======================================================================-->
+ <!--========                 Misc                                 =========-->
+ <!--=======================================================================-->
+
+ <target name="init" description="prepare directories">
+  <mkdir dir="output" />
+  <delete dir="temp"/>
+  <mkdir dir="temp"/>
+ </target>
+
+ <target name="init.tSQLtCLR" description="open tSQLtCLR artifact">
+  <echo message="Start: Unzip *.dll from tSQLtCLR.zip" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c" />
+   <arg value="dir output /S" />
+  </exec>
+  <unzip src="${basedir}/output/tSQLtCLR.zip" dest="${basedir}/output/tSQLtCLR"/>
+ 
+  <copy todir="${basedir}/output/tSQLtCLR/" flatten="true" preservelastmodified="true" verbose="true" force="true">
+   <!-- Fixing odd unzip dir behaviour in Azure DevOps  -->
+   <fileset dir="${basedir}/output/tSQLtCLR/tSQLtCLR/" erroronmissingdir="false">
+    <patternset>
+     <include name="*.dll"/>
+    </patternset>
+   </fileset>
+  </copy>
+ 
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c" />
+   <arg value="dir output /S" />
+  </exec>
+  <echo message="Finished: Unzip *.dll from tSQLtCLR.zip" />
+
+  <echo message="Read Version from tSQLtCLR.dll" />
+  <exec executable="cmd" dir="." failonerror="true" output="temp/Version.txt">
+   <arg value="/c"/>
+   <arg value="cscript //nologo VersionInfo.vbs output/tSQLtCLR/tSQLtCLR.dll"/>
+  </exec>
+
+  <echo message="Parse Version from tSQLtCLR.dll" />
+  <loadfile srcFile="temp/Version.txt" property="clr.version" failonerror="true">
+   <filterchain>
+    <striplinebreaks />
+    <tokenfilter>
+     <deletecharacters chars="\t" />
+     <trim />
+     <ignoreblank />
+    </tokenfilter>
+   </filterchain>
+  </loadfile>
+
+  <echo message="CLR Version is: [V${clr.version}]"/> </target>
+
+ <target name="teamcity" description="misc teamcity tasks">
+  <echo message="##BUILD[buildNumber 'V${clr.version}']" />
+ </target>
+
+ <!--=======================================================================-->
+ <!--========                 Build tSQLt.zip                      =========-->
+ <!--=======================================================================-->
+ 
+ <target name="package.copy.files">
+  <copy file="../Source/SetClrEnabled.sql" todir="temp"/>
+  <copy file="ReleaseNotes.txt" todir="temp"/>
+  <copy file="License.txt" todir="temp"/>
+ </target>
+
+ <target name="package.construct.tsqlt">
+  <echo message="Generating CREATE ASSEMBLY statement."/>
+  <exec executable="cmd" dir="." failonerror="true" output="temp/CreateAssembly.sql">
+   <arg value="/c"/>
+   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/tSQLtCLR.dll ../Source/tSQLtCLR.mdl.sql 0x000000 &quot;&quot; 200 &quot;'+\n'&quot;"/>
+  </exec>
+  <exec executable="cmd" dir="." failonerror="true" >
+   <arg value="/c"/>
+   <arg value="type temp\CreateAssembly.sql"/>
+  </exec>
+
+  <echo message="Generating GetSQLtExternalAccessKeyBytes function."/>
+  <exec executable="cmd" dir="." failonerror="true" output="temp/tSQLt.Private_GetExternalAccessKeyBytes.sql">
+   <arg value="/c"/>
+   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/tSQLtExternalAccessKey.dll ../Source/tSQLt.Private_GetExternalAccessKeyBytes.mdl.sql 0x000000 0x000001 200 &quot;+\n0x&quot;"/>
+  </exec>
+  <exec executable="cmd" dir="." failonerror="true" >
+   <arg value="/c"/>
+   <arg value="type temp\tSQLt.Private_GetExternalAccessKeyBytes.sql"/>
+  </exec>
+
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Source/BuildOrder.txt"/>
+   <arg value="temp/tSQLt.class.sql"/>
+   <arg value="---Build"/>
+  </exec>
+ </target>
+
+ <target name="replace.in.file">
+  <echo message="File: ${replace.file}" />
+  <echo message="Token: ${replace.token}" />
+  <echo message="Value: ${replace.value}" />
+  <move file="${replace.file}" tofile="${replace.file}.replacement.temp">
+   <filterchain>
+    <replacestring from="${replace.token}" to="${replace.value}" />
+    <tabstospaces tablength="1"/>
+   </filterchain>
+  </move>
+  <move file="${replace.file}.replacement.temp" tofile="${replace.file}" />
+ </target>
+
+ <target name="package.set.build.version">
+  <antcall target="replace.in.file">
+   <param name="replace.file" value="temp/ReleaseNotes.txt" />
+   <param name="replace.token" value="LATEST-BUILD-NUMBER" />
+   <param name="replace.value" value="${clr.version}" />
+  </antcall>
+
+  <antcall target="replace.in.file">
+   <param name="replace.file" value="temp/tSQLt.class.sql" />
+   <param name="replace.token" value="$LATEST-BUILD-NUMBER$" />
+   <param name="replace.value" value="${clr.version}" />
+  </antcall>
+
+ </target>
+
+ <target name="package.create.example">
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Examples/BuildOrder.txt"/>
+   <arg value="temp/Example.sql"/>
+  </exec>
+ </target>
+
+ <target name="package.create.artifacts">
+  <delete file="output/tSQLt.zip" />
+  <delete file="output/ReadMe.txt" />
+  <delete file="output/Version.txt" />
+  <zip zipfile="output/tSQLt.zip">
+   <fileset dir="temp">
+    <include name="ReleaseNotes.txt"/>
+    <include name="License.txt"/>
+    <include name="tSQLt.class.sql"/>
+    <include name="SetClrEnabled.sql"/>
+    <include name="Example.sql"/>
+   </fileset>
+  </zip>
+  <copy file="temp/Version.txt" tofile="output/Version.txt"/>
+  <copy file="temp/ReleaseNotes.txt" tofile="output/ReadMe.txt"/>
+ </target>
+
+ <!--=======================================================================-->
+ <!--========                 Build tSQLt Tests                    =========-->
+ <!--=======================================================================-->
+
+ <target name="init.tSQLt.tests" description="prepare directories for tSQLt build">
+  <delete dir="temp"/>
+  <mkdir dir="temp"/>
+ </target>
+
+ <target name="package.test.files">
+  <echo message="scripting tSQLtTestUtilCLR.dll" />
+  <exec executable="cmd" dir="." failonerror="true" output="temp/CreateTestUtilAssembly.sql">
+   <arg value="/c"/>
+   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/tSQLtTestUtilCLR.dll ../TestUtil/tSQLtTestUtilCLR.mdl.sql 0x000000"/>
+  </exec>
+
+  <echo message="scripting UnsignedEmpty.dll" />
+  <exec executable="cmd" dir="." failonerror="true" output="temp/GetUnsignedEmptyBytes.sql">
+   <arg value="/c"/>
+   <arg value="CreateAssemblyGenerator.exe output/tSQLtCLR/UnsignedEmpty.dll ../TestUtil/GetUnsignedEmptyBytes.mdl.sql 0x000000"/>
+  </exec>
+
+  <echo message="Building TestUtil.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../TestUtil/BuildOrder.txt"/>
+   <arg value="temp/TestUtil.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests/*.class.sql"/>
+   <arg value="temp/AllTests.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.2008.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests.2008/*.class.sql"/>
+   <arg value="temp/AllTests.2008.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.2012.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests.2012/*.class.sql"/>
+   <arg value="temp/AllTests.2012.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.2014.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests.2014/*.class.sql"/>
+   <arg value="temp/AllTests.2014.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.EXTERNAL_ACCESS.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests.EXTERNAL_ACCESS/*.class.sql"/>
+   <arg value="temp/AllTests.EXTERNAL_ACCESS.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.EXTERNAL_ACCESS_KEY_EXISTS.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests.EXTERNAL_ACCESS_KEY_EXISTS/*.class.sql"/>
+   <arg value="temp/AllTests.EXTERNAL_ACCESS_KEY_EXISTS.sql"/>
+  </exec>
+
+  <echo message="Building AllTests.SA.sql" />
+  <exec executable="cmd" dir="." failonerror="true">
+   <arg value="/c"/>
+   <arg value="BuildHelper.exe"/>
+   <arg value="../Tests.SA/*.class.sql"/>
+   <arg value="temp/AllTests.SA.sql"/>
+  </exec>
+
+  <echo message="Copying misc SQL files" />
+  <copy file="../Tests/BootStrapTest.sql" todir="temp"/>
+  <copy file="ExecuteAs(tSQLt.Build).sql" todir="temp"/>
+  <copy file="ExecuteAs(tSQLt.Build.SA).sql" todir="temp"/>
+  <copy file="Drop(tSQLtExternalAccessKey).sql" todir="temp"/>
+  <copy file="Install(tSQLtExternalAccessKey).sql" todir="temp"/>
+  <copy file="ChangeDbAndExecuteStatement(tSQLt.Build).sql" todir="temp"/>
+  <copy file="EnableExternalAccess.sql" todir="temp"/>
+  <copy file="CreateBuildDb.sql" todir="temp"/>
+  <copy file="Drop(master.tSQLt_testutil).sql" todir="temp"/>
+  <copy file="Install(master.tSQLt_testutil).sql" todir="temp"/>
+  <copy file="GetTestResults.sql" todir="temp"/>
+  <copy file="GetFailedTestCount.sql" todir="temp"/>
+  <copy file="../Examples/TestThatExamplesAreDeployed.sql" todir="temp"/>
+ </target>
+
+ <target name="package.test.create.artifacts">
+  <delete file="output/tSQLt.tests.zip" />
+  <zip zipfile="output/tSQLt.tests.zip">
+   <fileset dir="temp">
+    <include name="TestUtil.sql"/>
+    <include name="AllTests.sql"/>
+    <include name="AllTests.2008.sql"/>
+    <include name="AllTests.2012.sql"/>
+    <include name="AllTests.2014.sql"/>
+    <include name="AllTests.EXTERNAL_ACCESS.sql"/>
+    <include name="AllTests.EXTERNAL_ACCESS_KEY_EXISTS.sql"/>
+    <include name="AllTests.SA.sql"/>
+    <include name="BootStrapTest.sql"/>
+    <include name="ExecuteAs(tSQLt.Build).sql"/>
+    <include name="ExecuteAs(tSQLt.Build.SA).sql"/>
+    <include name="Drop(tSQLtExternalAccessKey).sql"/>
+    <include name="Install(tSQLtExternalAccessKey).sql"/>
+    <include name="EnableExternalAccess.sql"/>
+    <include name="Drop(master.tSQLt_testutil).sql"/>
+    <include name="Install(master.tSQLt_testutil).sql"/>
+    <include name="ChangeDbAndExecuteStatement(tSQLt.Build).sql"/>
+    <include name="CreateBuildDb.sql"/>
+    <include name="GetTestResults.sql"/>
+    <include name="GetFailedTestCount.sql"/>
+    <include name="TestThatExamplesAreDeployed.sql"/>
+   </fileset>
+  </zip>
+ </target>
+
+ <!--=======================================================================-->
+ <!--========                 Build SQLPromptSnippets              =========-->
+ <!--=======================================================================-->
+
+ <target name="init.SQLPromptSnippets" description="prepare directories for SQLPromptSnippets build">
+  <delete dir="temp"/>
+  <mkdir dir="temp"/>
+ </target>
+
+ <target name="package.SQLPromptSnippets.copy">
+  <copy todir="temp">
+   <fileset dir="../Snippets">
+    <include name="*.sqlpromptsnippet" />
+    <include name="ReadMe.txt" />
+   </fileset>
+  </copy>
+ </target>
+
+ <target name="package.SQLPromptSnippets.create.artifacts">
+  <delete file="output/tSQLtSnippets(SQLPrompt).zip" />
+  <zip zipfile="output/tSQLtSnippets(SQLPrompt).zip">
+   <fileset dir="temp">
+    <include name="*.*"/>
+   </fileset>
+  </zip>
+ </target>
+</project>
diff --git a/Build/tSQLt.buildCLR.xml b/Build/tSQLt.buildCLR.xml
new file mode 100644
index 000000000..9a23c6085
--- /dev/null
+++ b/Build/tSQLt.buildCLR.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<project name="tSQLt" default="all" basedir=".">
+ <description>Build tSQLt</description>
+ <target name="clean" description="remove all generated files">
+  <echo message="${msbuild.path}" />
+  <echo message="${db.server}" />
+  <echo message="${db.name}" />
+ </target>
+
+ <target
+   name="all"
+   depends="init, clr.compile, tSQLtExternalAccessKey.compile, clr.testutil.compile, clr.UnsignedEmpty.compile, package.files"
+   />
+
+
+ <!--=======================================================================-->
+ <!--========                 Misc                                 =========-->
+ <!--=======================================================================-->
+
+ <target name="init" description="prepare output directory">
+  <mkdir dir="output" />
+  <delete dir="temp"/>
+  <mkdir dir="temp"/>
+  <mkdir dir="temp/tSQLtCLR"/>
+  <property name="build.configuration" value="CruiseControl" />
+ </target>
+
+ <!--=======================================================================-->
+ <!--========                 Build tSQLt CLRs                     =========-->
+ <!--=======================================================================-->
+
+ <target name="clr.compile">
+  <echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; tSQLtCLR.csproj /p:Configuration=${build.configuration} /nologo"/>
+  <delete dir="../tSQLtCLR/tSQLtCLR/bin/${build.configuration}" />
+  <delete dir="../tSQLtCLR/tSQLtCLR/obj/${build.configuration}" />
+  <exec executable="cmd" dir="../tSQLtCLR/tSQLtCLR/" failonerror="true">
+   <arg value="/c"/>
+   <arg value="&quot;${msbuild.path}msbuild.exe&quot; tSQLtCLR.csproj /p:Configuration=${build.configuration} /nologo"/>
+  </exec>
+ </target>
+
+ <target name="tSQLtExternalAccessKey.compile">
+  <echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; tSQLtExternalAccessKey.csproj /p:Configuration=${build.configuration} /nologo"/>
+  <delete dir="../tSQLtCLR/tSQLtExternalAccessKey/bin/${build.configuration}" />
+  <delete dir="../tSQLtCLR/tSQLtExternalAccessKey/obj/${build.configuration}" />
+  <exec executable="cmd" dir="../tSQLtCLR/tSQLtExternalAccessKey/" failonerror="true">
+   <arg value="/c"/>
+   <arg value="&quot;${msbuild.path}msbuild.exe&quot; tSQLtExternalAccessKey.csproj /p:Configuration=${build.configuration} /nologo"/>
+  </exec>
+ </target>
+
+ <target name="clr.testutil.compile">
+  <echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; tSQLtTestUtilCLR.csproj /p:Configuration=${build.configuration} /nologo"/>
+  <delete dir="../tSQLtCLR/tSQLtTestUtilCLR/bin/${build.configuration}" />
+  <delete dir="../tSQLtCLR/tSQLtTestUtilCLR/obj/${build.configuration}" />
+  <exec executable="cmd" dir="../tSQLtCLR/tSQLtTestUtilCLR/" failonerror="true">
+   <arg value="/c"/>
+   <arg value="&quot;${msbuild.path}msbuild.exe&quot; tSQLtTestUtilCLR.csproj /p:Configuration=${build.configuration} /nologo"/>
+  </exec>
+ </target>
+
+ <target name="clr.UnsignedEmpty.compile">
+  <echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; UnsignedEmpty.csproj /p:Configuration=${build.configuration} /nologo"/>
+  <delete dir="../tSQLtCLR/UnsignedEmpty/bin/${build.configuration}" />
+  <delete dir="../tSQLtCLR/UnsignedEmpty/obj/${build.configuration}" />
+  <exec executable="cmd" dir="../tSQLtCLR/UnsignedEmpty/" failonerror="true">
+   <arg value="/c"/>
+   <arg value="&quot;${msbuild.path}msbuild.exe&quot; UnsignedEmpty.csproj /p:Configuration=${build.configuration} /nologo"/>
+  </exec>
+ </target>
+
+ <target name="package.files">
+  <copy todir="temp/tSQLtCLR" flatten="true">
+   <fileset dir="../tSQLtCLR">
+    <include name="*/bin/${build.configuration}/*.dll"/>
+   </fileset>
+  </copy>
+  <delete file="output/tSQLtCLR.zip" />
+  <zip zipfile="output/tSQLtCLR.zip">
+   <fileset dir="temp/tSQLtCLR">
+    <include name="*.*"/>
+   </fileset>
+  </zip>
+ </target>
+</project>
\ No newline at end of file
diff --git a/Build/tSQLt.copybuild.xml b/Build/tSQLt.copybuild.xml
new file mode 100644
index 000000000..4bfb3a914
--- /dev/null
+++ b/Build/tSQLt.copybuild.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<project name="tSQLt" default="all" basedir=".">
+
+ <target name="all" depends="hello, copy" />
+
+
+ <target name="hello" description="announcement">
+  <loadfile srcFile="output/Version.txt" property="clr.version" failonerror="true">
+   <filterchain>
+    <striplinebreaks />
+    <tokenfilter>
+     <deletecharacters chars="\t" />
+     <trim />
+     <ignoreblank />
+    </tokenfilter>
+   </filterchain>
+  </loadfile>
+
+  <echo message="Copying tSQLt build files to local Build_Output. (Version:${clr.version})" />
+ </target>
+
+ <target name="copy" description="prepare directories for tSQLt build">
+
+  <mkdir dir="../Build_Output" />
+   
+  <delete>
+   <fileset dir="../Build_Output">
+    <include name="*.sql" />
+    <include name="*.txt" />
+    <include name="*.zip" />
+   </fileset>
+  </delete>
+
+  <unzip src="output/tSQLt.zip" dest="../Build_Output" />
+  <unzip src="output/tSQLt.tests.zip" dest="../Build_Output" />
+
+  <copy todir="../Build_Output">
+   <fileset dir="output">
+    <include name="tSQLt.zip" />
+    <include name="tSQLt.tests.zip" />
+    <include name="tSQLtSnippets(SQLPrompt).zip" />
+    <include name="Version.txt" />
+    <include name="ReadMe.txt" />
+   </fileset>
+  </copy>
+ </target>
+
+
+</project>
diff --git a/Build/tSQLt.experiments.build.xml b/Build/tSQLt.experiments.build.xml
new file mode 100644
index 000000000..1b5094391
--- /dev/null
+++ b/Build/tSQLt.experiments.build.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<project name="tSQLt" default="testo" basedir=".">
+ <target name="testi">
+  <echo message="I1pv:${pv}" />
+  <echo message="I1:${testp}" />
+  <property name="testp" value="v:${v}" />
+  <echo message="I2:${testp}" />
+  <echo message="Iov:${ov}" />
+  <antcall target="testii" />
+ </target>
+ <target name="testii">
+  <echo message="IIpv:${pv}" />
+  <echo message="II:${testp}" />
+  <echo message="IIov:${ov}" />
+ </target>
+ <target name="testo">
+  <echo message="-----------" />
+  <echo message="- testo   -" />
+  <echo message="-----------" />
+  <property name="pv" value="false" />
+  <echo message="O1pv:${pv}" />
+  <echo message="O1:${testp}" />
+  <echo message="----------------------" />
+  <echo message="- calling testi(v=1) -" />
+  <echo message="----------------------" />
+  <antcall target ="testi">
+   <param name="v" value="1" />
+   <param name="pv" value="true" />
+   <param name="ov" value="o1" />
+  </antcall>
+  <echo message="O2:${testp}" />
+  <echo message="----------------------" />
+  <echo message="- calling testi(v=2) -" />
+  <echo message="----------------------" />
+  <antcall target ="testi">
+   <param name="v" value="2" />
+   <param name="ov" value="o2" />
+  </antcall>
+  <echo message="O3:${testp}" />
+ </target>
+
+ <target name="testf">
+  <echo message="----------------------" />
+  <echo message="- sql output test    -" />
+  <echo message="----------------------" />
+  <delete dir="temp"/>
+  <mkdir dir="temp"/>
+  <touch file="temp/temp.txt" />
+  <echo file="temp/temp_executeas.sql" message="print 0;" />
+  <antcall target="execute.sql.statement">
+   <param name="execute.sql.elevated" value="false" />
+   <param name="execute.sql.outputfile" value="" />
+   <param name="execute.sql.database" value="tempdb" />
+   <param name="execute.sql.statement" value="print 42;" />
+   <param name="execute.sql.filename" value="" />
+  </antcall>
+  <loadfile property="testf.contents" srcFile="temp/temp.txt" />
+  <echo message="output file contents: ${testf.contents}" />
+ </target>
+</project>
\ No newline at end of file
diff --git a/Build/tSQLt.validatebuild b/Build/tSQLt.validatebuild
index 99bbdbfa7..36349b27b 100644
--- a/Build/tSQLt.validatebuild
+++ b/Build/tSQLt.validatebuild
@@ -3,7 +3,7 @@
 
  <target name="all" depends="deploy.all, validate.tSQLt, validate.Example" />
  
- <target name="deploy.all" depends="hello, init, create.tSQLt.scripts, create.Example.scripts, deploy.tSQLt" />
+ <target name="deploy.all" depends="reset.parameter.variables, hello, init, create.tSQLt.scripts, create.Example.scripts, deploy.tSQLt, deploy.Example" />
 
  <target name="hello" description="announcement">
   <loadfile
@@ -20,6 +20,20 @@
   <echo message="db.name: ${db.name}" />
  </target>
 
+ <target name="reset.parameter.variables">
+  <property name="append.source" value="" />
+  <property name="append.target" value="" />
+  <property name="append.file.content" value="" />
+  <property name="execute.sql.elevated" value="false" />
+  <property name="execute.sql.outputfile" value="" />
+  <property name="execute.sql.filename" value="" />
+  <property name="execute.sql.statement" value="" />
+  <property name="execute.sql.database" value="" />
+  <property name="deployandrun.tests.filename" value="" />
+  <property name="deployandrun.tests.elevated" value="false" />
+  <property name="deployandrun.tests.outputfile" value="" />
+ </target>
+
  <!--=======================================================================-->
  <!--========               initialize artifact files              =========-->
  <!--=======================================================================-->
@@ -101,7 +115,7 @@
  <!--========                   create database                    =========-->
  <!--=======================================================================-->
 
- <target name="execute.sql.satement_or_file">
+ <target name="execute.sql.statement_or_file">
   <choose>
    <when test="${execute.sql.elevated == 'true'}">
     <property name="execute.sql.executeas" value="temp/temp_executeas_sa.sql" />
@@ -138,7 +152,7 @@
   <property name="execute.sql.statement" value="" />
   <property name="temp.execute.sql.filename" value="${execute.sql.filename}" />
   <property name="execute.sql.filename" value="&quot;${execute.sql.filename}&quot;" />
-  <call target="execute.sql.satement_or_file" />
+  <call target="execute.sql.statement_or_file" />
   <property name="execute.sql.statement" value="${temp.execute.sql.statement}" />
   <property name="execute.sql.filename" value="${temp.execute.sql.filename}" />
  </target>
@@ -150,7 +164,7 @@
   </if>
   <property name="temp.execute.sql.filename" value="${execute.sql.filename}" />
   <property name="execute.sql.filename" value="" />
-  <call target="execute.sql.satement_or_file" />
+  <call target="execute.sql.statement_or_file" />
   <property name="execute.sql.filename" value="${temp.execute.sql.filename}" />
  </target>
 
@@ -178,19 +192,20 @@
 
  <target name="deploy.tSQLt" description="execute create scripts">
   <echo message="##teamcity[progressMessage 'Deploying tSQLt']" />
-  <property name="execute.sql.outputfile" value="" />
+  <call target="reset.parameter.variables" />
+
   <property name="execute.sql.database" value="tempdb" />
   <property name="execute.sql.filename" value="temp/temp_create_db.sql" />
   <call target="execute.sql.file" />
 
   <property name="execute.sql.database" value="${db.name}" />
-  
   <property name="execute.sql.filename" value="temp/tSQLt.class.sql" />
   <call target="execute.sql.file" />
  </target>
 
 
  <target name="deployandrun.tests" description="deploy and run one tests file">
+  <property name="execute.sql.database" value="${db.name}" />
   <property name="execute.sql.outputfile" value="" />
   <property name="execute.sql.statement" value="EXEC tSQLt.Reset;" />
   <call target="execute.sql.statement" />
@@ -210,7 +225,10 @@
 
  <target name="validate.tSQLt" description="run the tests">
   <echo message="##teamcity[progressMessage 'Validating tSQLt']" />
-  
+
+  <call target="reset.parameter.variables" />
+  <property name="execute.sql.database" value="${db.name}" />
+
   <!-- prepare master -->
   <property name="execute.sql.elevated" value="true" />
   <property name="execute.sql.filename" value="temp/Drop(master.tSQLt_testutil).sql" />
@@ -245,11 +263,13 @@
   <call target="execute.sql.file" />
 
   <!-- EAKE Tests -->
+  <property name="deployandrun.tests.elevated" value="true" />
   <property name="deployandrun.tests.filename" value="temp/AllTests.EXTERNAL_ACCESS_KEY_EXISTS.sql" />
   <property name="deployandrun.tests.outputfile" value="output/TestResults_EXTERNAL_ACCESS_KEY_EXISTS.xml" />
   <call target="deployandrun.tests" />
 
   <!-- Enable EA -->
+  <property name="execute.sql.elevated" value="true" />
   <property name="execute.sql.filename" value="temp/EnableExternalAccess.sql" />
   <call target="execute.sql.file" />
 
@@ -267,7 +287,8 @@
 
  <target name="deploy.Example" description="execute create scripts">
   <echo message="##teamcity[progressMessage 'Deploying Example']" />
-  <property name="execute.sql.outputfile" value="" />
+  <call target="reset.parameter.variables" />
+
   <property name="execute.sql.database" value="tempdb" />
   <property name="execute.sql.filename" value="temp/temp_create_example.sql" />
   <call target="execute.sql.file" />
@@ -275,6 +296,8 @@
 
  <target name="validate.Example" description="run the tests">
   <echo message="##teamcity[progressMessage 'Validating Example']" />
+  <call target="reset.parameter.variables" />
+
   <property name="execute.sql.database" value="tSQLt_Example" />
   <property name="execute.sql.outputfile" value="output/ExampleTestResults.xml" />
   <property name="execute.sql.statement" value="PRINT DB_NAME();EXEC tSQLt.Run 'ExampleDeployed';" />
diff --git a/Build/tSQLt.validatebuild.xml b/Build/tSQLt.validatebuild.xml
new file mode 100644
index 000000000..af001c0f6
--- /dev/null
+++ b/Build/tSQLt.validatebuild.xml
@@ -0,0 +1,429 @@
+<?xml version="1.0"?>
+<project name="tSQLt" default="all" basedir=".">
+
+ <target name="all" depends="deploy.all, validate.tSQLt, validate.Example, report.SQL.Version" />
+
+ <target name="deploy.all" depends="reset.parameter.variables, hello, init, create.tSQLt.scripts, create.Example.scripts, deploy.tSQLt, deploy.Example" />
+
+ <target name="hello" description="announcement">
+  <loadfile
+    failonerror="true"
+    srcfile="output/Version.txt"
+    property="clr.version"
+   />
+  <property name="clr.version" value="${string::trim(clr.version)}" />
+
+  <echo message="Validating tSQLt build." />
+  <echo message="Target SQL Server version: ${db.version}" />
+  <echo message="tSQLt build version is: [V${clr.version}]" />
+  <echo message="db.server: ${db.server}" />
+  <echo message="db.name: ${db.name}" />
+
+  <condition property="db.version.ge.2008">
+   <or>
+    <equals arg1="${db.version}" arg2="2008" />
+    <equals arg1="${db.version}" arg2="2008R2" />
+    <equals arg1="${db.version}" arg2="2012" />
+    <equals arg1="${db.version}" arg2="2014" />
+   </or>
+  </condition>
+  <condition property="db.version.ge.2012">
+   <or>
+    <equals arg1="${db.version}" arg2="2012" />
+    <equals arg1="${db.version}" arg2="2014" />
+   </or>
+  </condition>
+  <condition property="db.version.ge.2014">
+   <or>
+    <equals arg1="${db.version}" arg2="2014" />
+   </or>
+  </condition>
+  <echo message="db.version.ge.2008: ${db.version.ge.2008}" />
+  <echo message="db.version.ge.2012: ${db.version.ge.2012}" />
+  <echo message="db.version.ge.2014: ${db.version.ge.2014}" />
+
+ </target>
+
+ <target name="report.SQL.Version">
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.outputfile" value="" />
+   <param name="execute.sql.filename" value="PrintVersionInfo.sql" />
+  </antcall>
+ </target>
+
+ <target name="reset.parameter.variables">
+  <property name="execute.sql.elevated" value="false" />
+  <property name="execute.sql.outputfile" value="" />
+  <property name="execute.sql.filename" value="" />
+  <property name="execute.sql.statement" value="" />
+  <property name="execute.sql.database" value="" />
+  <property name="deployandrun.tests.filename" value="" />
+  <property name="deployandrun.tests.elevated" value="false" />
+  <property name="deployandrun.tests.outputfile" value="" />
+ </target>
+
+ <!--=======================================================================-->
+ <!--========               initialize artifact files              =========-->
+ <!--=======================================================================-->
+
+ <target name="init" description="prepare directories for tSQLt build">
+  <delete dir="temp"/>
+  <mkdir dir="temp"/>
+
+  <unzip src="output/tSQLt.zip" dest="temp" />
+  <unzip src="output/tSQLt.tests.zip" dest="temp" />
+
+  <property name="execute.sql.elevated" value="false" />
+  <property name="deployandrun.tests.elevated" value="false" />
+
+ </target>
+
+ <target name="append.file" description="append one sql file to another">
+  <echo message="append:${append.source}" />
+  <loadfile srcfile="${append.source}" property="append.file.content" />
+  <echo message="${append.file.content}" file="${append.target}" append="true"/>
+  <echo message="${line.separator}${line.separator}GO${line.separator}${line.separator}" file="${append.target}" append="true" />
+ </target>
+
+ <target name="create.tSQLt.scripts.AllTests.Main">
+  <delete file="temp/AllTests.Main.sql" />
+  <antcall target="append.file">
+   <param name="append.target" value="temp/AllTests.Main.sql" />
+   <param name="append.source" value="temp/TestUtil.sql" />
+  </antcall>
+  <antcall target="append.file">
+   <param name="append.target" value="temp/AllTests.Main.sql" />
+   <param name="append.source" value="temp/AllTests.sql" />
+  </antcall>
+ </target>
+ <target name="append.tSQLt.scripts.AllTests.2008" if="db.version.ge.2008">
+  <antcall target="append.file">
+   <param name="append.target" value="temp/AllTests.Main.sql" />
+   <param name="append.source" value="temp/AllTests.2008.sql" />
+  </antcall>
+ </target>
+ <target name="append.tSQLt.scripts.AllTests.2012" if="db.version.ge.2012">
+  <antcall target="append.file">
+   <param name="append.target" value="temp/AllTests.Main.sql" />
+   <param name="append.source" value="temp/AllTests.2012.sql" />
+  </antcall>
+ </target>
+ <target name="append.tSQLt.scripts.AllTests.2014" if="db.version.ge.2014">
+  <antcall target="append.file">
+   <param name="append.target" value="temp/AllTests.Main.sql" />
+   <param name="append.source" value="temp/AllTests.2014.sql" />
+  </antcall>
+ </target>
+ <target name="create.tSQLt.scripts" description="generate database creation scripts">
+  <delete file="temp/temp_create_db.sql" />
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_create_db.sql" />
+   <param name="append.source" value="temp/CreateBuildDb.sql" />
+  </antcall>
+
+  <delete file="temp/temp_executeas.sql" />
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_executeas.sql" />
+   <param name="append.source" value="temp/ExecuteAs(tSQLt.Build).sql" />
+  </antcall>
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_executeas.sql" />
+   <param name="append.source" value="temp/ChangeDbAndExecuteStatement(tSQLt.Build).sql" />
+  </antcall>
+
+  <delete file="temp/temp_executeas_sa.sql" />
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_executeas_sa.sql" />
+   <param name="append.source" value="temp/ExecuteAs(tSQLt.Build.SA).sql" />
+  </antcall>
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_executeas_sa.sql" />
+   <param name="append.source" value="temp/ChangeDbAndExecuteStatement(tSQLt.Build).sql" />
+  </antcall>
+
+  <antcall target="create.tSQLt.scripts.AllTests.Main" />
+  <antcall target="append.tSQLt.scripts.AllTests.2008" />
+  <antcall target="append.tSQLt.scripts.AllTests.2012" />
+  <antcall target="append.tSQLt.scripts.AllTests.2014" />
+
+ </target>
+
+ <target name="create.Example.scripts" description="generate database creation scripts">
+  <delete file="temp/temp_create_example.sql" />
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_create_example.sql" />
+   <param name="append.source" value="temp/Example.sql" />
+  </antcall>
+  <antcall target="append.file">
+   <param name="append.target" value="temp/temp_create_example.sql" />
+   <param name="append.source" value="temp/TestThatExamplesAreDeployed.sql" />
+  </antcall>
+
+ </target>
+
+ <!--=======================================================================-->
+ <!--========                   create database                    =========-->
+ <!--=======================================================================-->
+
+ <target name="execute.sql.statement_or_file.permissions.elevated" if="execute.sql.statement_or_file.permissions.elevated">
+  <echo message="--> execute.sql.statement_or_file.elevated" />
+  <antcall target="execute.sql.statement_or_file.exec">
+   <param name="execute.sql.executeas" value="temp/temp_executeas_sa.sql" />
+  </antcall>
+ </target>
+ <target name="execute.sql.statement_or_file.permissions.default" unless="execute.sql.statement_or_file.permissions.elevated">
+  <echo message="--> execute.sql.statement_or_file.default" />
+  <antcall target="execute.sql.statement_or_file.exec">
+   <param name="execute.sql.executeas" value="temp/temp_executeas.sql" />
+  </antcall>
+ </target>
+ <target name="execute.sql.statement_or_file.with.permissions">
+  <echo message="execute.sql.statement_or_file.with.permissions started" />
+  <echo message="  +----> filename: ${execute.sql.filename}" />
+  <echo message="  +----> statement: ${execute.sql.statement}" />
+  <echo message="  +----> executeas: ${execute.sql.executeas}" />
+  <echo message="  +----> sqlconnect: ${execute.sql.sqlconnect}" />
+  <antcall target="execute.sql.statement_or_file.permissions.default" />
+  <antcall target="execute.sql.statement_or_file.permissions.elevated" />
+  <echo message="execute.sql.statement_or_file.with.permissions finished" />
+ </target>
+
+ <target name="execute.sql.statement_or_file" description="Execute a SQL Statement or File.">
+  <echo message="execute.sql.statement_or_file started" />
+  <echo message="  +----> filename: ${execute.sql.filename}" />
+  <echo message="  +----> statement: ${execute.sql.statement}" />
+
+  <condition property="execute.sql.statement_or_file.permissions.elevated">
+   <equals arg1="${execute.sql.elevated}" arg2="true" />
+  </condition>
+  <antcall target="execute.sql.statement_or_file.with.permissions">
+   <param name="execute.sql.executeas" value="temp/temp_executeas.sql" />
+   <param name="execute.sql.sqlconnect" value="-S&quot;${db.server}&quot; -E" />
+  </antcall>
+ </target>
+ <!--
+  <choose>
+   <when test="${property::exists('db.user')}">
+    <property name="execute.sql.sqlconnect" value="-S&quot;${db.server}&quot; -U&quot;${db.user}&quot; -P&quot;${db.password}&quot;" />
+   </when>
+   <otherwise>
+    <property name="execute.sql.sqlconnect" value="-S&quot;${db.server}&quot; -E" />
+   </otherwise>
+  </choose>
+  -->
+ <target name="execute.sql.statement_or_file.exec">
+  <echo message="execute.sql.statement_or_file.exec started" />
+  <echo message="  +----> filename: ${execute.sql.filename}" />
+  <echo message="  +----> statement: ${execute.sql.statement}" />
+  <echo message="  +----> outputfile: ${execute.sql.outputfile}" />
+  <echo message="  +----> executeas: ${execute.sql.executeas}" />
+  <echo message="  +----> sqlconnect: ${execute.sql.sqlconnect}" />
+  <property name="execute.sql.sqlcmd" value="sqlcmd ${execute.sql.sqlconnect} -I -i &quot;${execute.sql.executeas}&quot; ${execute.sql.filename} -v NewDbName=${db.name} DbName=${execute.sql.database} ExecuteStatement=&quot;${execute.sql.statement}&quot; -V11" />
+  <echo message="${execute.sql.sqlcmd}" />
+  <condition property="execute.sql.statement_or_file.output.tofile">
+   <not>
+    <equals arg1="${execute.sql.outputfile}" arg2="" />
+   </not>
+  </condition>
+  <antcall target="execute.sql.statement_or_file.exec.output.tofile" />
+  <antcall target="execute.sql.statement_or_file.exec.output.toconsole" />
+ </target>
+
+ <target name="execute.sql.statement_or_file.exec.output.tofile" if="execute.sql.statement_or_file.output.tofile">
+  <echo message="execute.sql.statement_or_file.exec.output.tofile started" />
+  <echo message="  +----> outputfile: ${execute.sql.outputfile}" />
+  <exec executable="cmd" failonerror="true" output="${execute.sql.outputfile}">
+   <arg value="/c"/>
+   <arg value="${execute.sql.sqlcmd}"/>
+  </exec>
+ </target>
+ <target name="execute.sql.statement_or_file.exec.output.toconsole" unless="execute.sql.statement_or_file.output.tofile">
+  <echo message="execute.sql.statement_or_file.exec.output.toconsole started" />
+  <exec executable="cmd" failonerror="true">
+   <arg value="/c"/>
+   <arg value="${execute.sql.sqlcmd}"/>
+  </exec>
+ </target>
+
+ <target name="execute.sql.file">
+  <echo message="execute.sql.file: ${execute.sql.filename}" />
+  <echo message="execute.sql.file output: ${execute.sql.outputfile}" />
+  <antcall target="execute.sql.statement_or_file">
+   <param name="temp.execute.sql.statement" value="" />
+   <param name="execute.sql.filename" value="&quot;${execute.sql.filename}&quot;" />
+  </antcall>
+ </target>
+
+ <target name="execute.sql.statement">
+  <echo message="execute.sql.statement: ${execute.sql.statement}" />
+  <antcall target="execute.sql.statement_or_file">
+   <param name="execute.sql.filename" value="" />
+   <param name="execute.sql.statement" value="${execute.sql.statement}" />
+  </antcall>
+ </target>
+
+ <target name="execute.sql.tests">
+  <antcall target="execute.sql.statement">
+   <param name="execute.sql.statement" value="${execute.sql.statement}" />
+   <param name="execute.sql.outputfile" value="" />
+  </antcall>
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.outputfile" value="${execute.sql.outputfile}" />
+   <param name="execute.sql.filename" value="temp/GetTestResults.sql" />
+   <param name="execute.sql.statement" value="" />
+  </antcall>
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.outputfile" value="" />
+   <param name="execute.sql.filename" value="temp/GetFailedTestCount.sql" />
+   <param name="execute.sql.statement" value="" />
+  </antcall>
+ </target>
+
+
+ <target name="deploy.tSQLt" description="execute create scripts">
+  <echo message="##teamcity[progressMessage 'Deploying tSQLt']" />
+  <antcall target="reset.parameter.variables" />
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="tempdb" />
+   <param name="execute.sql.filename" value="temp/temp_create_db.sql" />
+  </antcall>
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.filename" value="temp/tSQLt.class.sql" />
+  </antcall>
+ </target>
+
+
+ <target name="deployandrun.tests" description="deploy and run one tests file">
+  <antcall target="execute.sql.statement">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.outputfile" value="" />
+   <param name="execute.sql.statement" value="EXEC tSQLt.Reset;" />
+  </antcall>
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.outputfile" value="" />
+   <param name="execute.sql.filename" value="${deployandrun.tests.filename}" />
+  </antcall>
+
+  <antcall target="execute.sql.tests">
+   <param name="execute.sql.elevated" value="${deployandrun.tests.elevated}" />
+   <param name="execute.sql.outputfile" value="${deployandrun.tests.outputfile}" />
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.statement" value="EXEC tSQLt.SetVerbose @Verbose = 1;EXEC tSQLt.RunNew;" />
+  </antcall>
+ </target>
+
+
+ <target name="validate.tSQLt" description="run the tests">
+  <echo message="##teamcity[progressMessage 'Validating tSQLt']" />
+
+  <antcall target="reset.parameter.variables" />
+
+  <!-- prepare master -->
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.filename" value="temp/Drop(master.tSQLt_testutil).sql" />
+  </antcall>
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.filename" value="temp/Install(master.tSQLt_testutil).sql" />
+  </antcall>
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.filename" value="temp/Drop(tSQLtExternalAccessKey).sql" />
+  </antcall>
+
+  <!-- run bootstrap tests -->
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.filename" value="temp/BootStrapTest.sql" />
+  </antcall>
+
+  <!-- run non-specific tests -->
+  <antcall target="deployandrun.tests">
+   <param name="deployandrun.tests.elevated" value="false" />
+   <param name="deployandrun.tests.filename" value="temp/AllTests.Main.sql" />
+   <param name="deployandrun.tests.outputfile" value="output/TestResults.xml" />
+  </antcall>
+
+  <!-- run SA tests -->
+  <antcall target="deployandrun.tests">
+   <param name="deployandrun.tests.elevated" value="true" />
+   <param name="deployandrun.tests.filename" value="temp/AllTests.SA.sql" />
+   <param name="deployandrun.tests.outputfile" value="output/TestResults_SA.xml" />
+  </antcall>
+
+  <!-- create EXTERNAL_ACCESS key -->
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.filename" value="temp/Install(tSQLtExternalAccessKey).sql" />
+  </antcall>
+
+  <!-- EAKE Tests -->
+  <antcall target="deployandrun.tests">
+   <param name="deployandrun.tests.elevated" value="true" />
+   <param name="deployandrun.tests.filename" value="temp/AllTests.EXTERNAL_ACCESS_KEY_EXISTS.sql" />
+   <param name="deployandrun.tests.outputfile" value="output/TestResults_EXTERNAL_ACCESS_KEY_EXISTS.xml" />
+  </antcall>
+
+  <!-- Enable EA -->
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.filename" value="temp/EnableExternalAccess.sql" />
+  </antcall>
+
+  <!-- EA Tests -->
+  <antcall target="deployandrun.tests">
+   <param name="deployandrun.tests.elevated" value="false" />
+   <param name="deployandrun.tests.filename" value="temp/AllTests.EXTERNAL_ACCESS.sql" />
+   <param name="deployandrun.tests.outputfile" value="output/TestResults_EXTERNAL_ACCESS.xml" />
+  </antcall>
+
+  <!-- cleanup master -->
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="${db.name}" />
+   <param name="execute.sql.elevated" value="true" />
+   <param name="execute.sql.filename" value="temp/Drop(master.tSQLt_testutil).sql" />
+  </antcall>
+
+ </target>
+
+ <target name="deploy.Example" description="execute create scripts">
+  <echo message="##teamcity[progressMessage 'Deploying Example']" />
+  <antcall target="reset.parameter.variables" />
+
+  <antcall target="execute.sql.file">
+   <param name="execute.sql.database" value="tempdb" />
+   <param name="execute.sql.filename" value="temp/temp_create_example.sql" />
+  </antcall>
+ </target>
+
+ <target name="validate.Example" description="run the tests">
+  <echo message="##teamcity[progressMessage 'Validating Example']" />
+  <antcall target="reset.parameter.variables" />
+
+  <antcall target="execute.sql.tests">
+   <param name="execute.sql.database" value="tSQLt_Example" />
+   <param name="execute.sql.outputfile" value="output/ExampleTestResults.xml" />
+   <param name="execute.sql.statement" value="PRINT DB_NAME();EXEC tSQLt.Run 'ExampleDeployed';" />
+  </antcall>
+
+ </target>
+
+</project>
diff --git a/Build_Output/Build_Output.ssmssqlproj b/Build_Output/Build_Output.ssmssqlproj
index 573ffac80..d3637404e 100644
--- a/Build_Output/Build_Output.ssmssqlproj
+++ b/Build_Output/Build_Output.ssmssqlproj
@@ -3,7 +3,7 @@
   <Items>
     <LogicalFolder Name="Connections" Type="2" Sorted="true">
       <Items>
-        <ConnectionNode Name="Dev_tSQLt:MacWin7A\meinse00">
+        <ConnectionNode Name="Dev_tSQLt:WIN10A\meinse00">
           <Created>2016-01-24T17:37:52.9704757-05:00</Created>
           <Type>SQL</Type>
           <Server>Dev_tSQLt</Server>
@@ -152,8 +152,8 @@
           <FullPath>Install(tSQLtExternalAccessKey).sql</FullPath>
         </FileNode>
         <FileNode Name="SetClrEnabled.sql">
-          <AssociatedConnectionMoniker />
-          <AssociatedConnSrvName />
+          <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
+          <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
           <AssociatedConnUserName />
           <FullPath>SetClrEnabled.sql</FullPath>
         </FileNode>
diff --git a/Experiments/Experiments.ssmssqlproj b/Experiments/Experiments.ssmssqlproj
index 0603c8934..1494b3405 100644
--- a/Experiments/Experiments.ssmssqlproj
+++ b/Experiments/Experiments.ssmssqlproj
@@ -3,7 +3,7 @@
   <Items>
     <LogicalFolder Name="Connections" Type="2" Sorted="true">
       <Items>
-        <ConnectionNode Name="Dev_tSQLt:MacWin7A\meinse00">
+        <ConnectionNode Name="Dev_tSQLt:WIN10A\meinse00">
           <Created>2014-11-24T18:14:33.2545881-05:00</Created>
           <Type>SQL</Type>
           <Server>Dev_tSQLt</Server>
@@ -61,6 +61,12 @@
           <AssociatedConnUserName />
           <FullPath>SpProcPrototype.sql</FullPath>
         </FileNode>
+        <FileNode Name="tSQLtListObjects.sql">
+          <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
+          <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
+          <AssociatedConnUserName />
+          <FullPath>tSQLtListObjects.sql</FullPath>
+        </FileNode>
         <FileNode Name="XMLExperiment.sql">
           <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
           <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
diff --git a/Experiments/tSQLtListObjects.sql b/Experiments/tSQLtListObjects.sql
new file mode 100644
index 000000000..93e80286d
--- /dev/null
+++ b/Experiments/tSQLtListObjects.sql
@@ -0,0 +1,54 @@
+SELECT 
+    O.type_desc,
+    QUOTENAME(S.name)+'.'+QUOTENAME(O.name) AS name,
+    PP.parameters,
+    CC.columns
+  FROM sys.objects AS O
+  JOIN sys.schemas AS S
+    ON S.schema_id = O.schema_id
+ CROSS APPLY
+ (
+   SELECT SUBSTRING
+   (
+     (
+       SELECT ','+CHAR(13)+CHAR(10)+CASE WHEN P.parameter_id = 0 THEN '{RETURN}' ELSE P.name END+' '+ISNULL(PGFTN.TypeName,'') 
+         FROM sys.parameters AS P
+        OUTER APPLY tSQLt.Private_GetFullTypeName(P.user_type_id,P.max_length,P.precision,P.scale,NULL) AS PGFTN
+        WHERE P.object_id = O.object_id
+        ORDER BY P.parameter_id
+          FOR XML PATH(''),TYPE
+     ).value('.','VARCHAR(MAX)'),
+     4,
+     -1-POWER(-2,31)
+   ) parameters
+ )PP
+ CROSS APPLY
+ (
+   SELECT SUBSTRING
+   (
+     (
+       SELECT ','+CHAR(13)+CHAR(10)+C.name+' '+ISNULL(PGFTN.TypeName,'') 
+         FROM sys.columns AS C
+        OUTER APPLY tSQLt.Private_GetFullTypeName(C.user_type_id,C.max_length,C.precision,C.scale,C.collation_name) AS PGFTN
+        WHERE C.object_id = O.object_id
+        ORDER BY C.column_id
+          FOR XML PATH(''),TYPE
+     ).value('.','VARCHAR(MAX)'),
+     4,
+     -1-POWER(-2,31)
+   ) columns
+ )CC
+ WHERE O.is_ms_shipped = 0
+   AND S.name = 'tSQLt'
+   AND O.type IN('TT','FN','IF','U','FS','V','P','TF','PC','FT')
+ ORDER BY CASE WHEN O.name LIKE 'Private[_]%' THEN 1 ELSE 0 END,O.type_desc,name
+
+
+SELECT SCHEMA_NAME(T.schema_id),* FROM sys.types AS T
+--SELECT * FROM sys.columns AS C
+
+--SELECT type,O.type_desc,COUNT(1) FROM sys.objects AS O GROUP BY O.type ,O.type_desc
+
+--SELECT -1-POWER(-2,31)
+
+--SELECT CAST(',  ' AS VARBINARY(MAX))
diff --git a/Source/Source.ssmssqlproj b/Source/Source.ssmssqlproj
index ed043c2a4..01b2d9a4d 100644
--- a/Source/Source.ssmssqlproj
+++ b/Source/Source.ssmssqlproj
@@ -3,7 +3,7 @@
   <Items>
     <LogicalFolder Name="Connections" Type="2" Sorted="true">
       <Items>
-        <ConnectionNode Name="Dev_2005:MacWin7A\meinse00">
+        <ConnectionNode Name="Dev_2005:WIN10A\meinse00">
           <Created>2015-07-26T23:07:57.2567069-04:00</Created>
           <Type>SQL</Type>
           <Server>Dev_2005</Server>
@@ -15,7 +15,7 @@
           <ConnectionProtocol>NotSpecified</ConnectionProtocol>
           <ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
         </ConnectionNode>
-        <ConnectionNode Name="Dev_tSQLt:MacWin7A\meinse00">
+        <ConnectionNode Name="Dev_tSQLt:WIN10A\meinse00">
           <Created>2014-07-30T13:44:05.3611369-04:00</Created>
           <Type>SQL</Type>
           <Server>Dev_tSQLt</Server>
@@ -175,6 +175,12 @@
           <AssociatedConnUserName />
           <FullPath>tSQLt.FakeFunction.ssp.sql</FullPath>
         </FileNode>
+        <FileNode Name="tSQLt.FakeTable.ssp.sql">
+          <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
+          <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
+          <AssociatedConnUserName />
+          <FullPath>tSQLt.FakeTable.ssp.sql</FullPath>
+        </FileNode>
         <FileNode Name="tSQLt.Info.sfn.sql">
           <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
           <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
@@ -355,12 +361,6 @@
           <AssociatedConnUserName />
           <FullPath>tSQLt.Private_RenameObjectToUniqueName.ssp.sql</FullPath>
         </FileNode>
-        <FileNode Name="tSQLt.FakeTable.ssp.sql">
-          <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
-          <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
-          <AssociatedConnUserName />
-          <FullPath>tSQLt.FakeTable.ssp.sql</FullPath>
-        </FileNode>
         <FileNode Name="tSQLt.Private_GetIdentityDefinition.sfn.sql">
           <AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
           <AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
diff --git a/Source/tSQLt.Private_GetExternalAccessKeyBytes.mdl.sql b/Source/tSQLt.Private_GetExternalAccessKeyBytes.mdl.sql
index 22406d33d..f76673272 100644
--- a/Source/tSQLt.Private_GetExternalAccessKeyBytes.mdl.sql
+++ b/Source/tSQLt.Private_GetExternalAccessKeyBytes.mdl.sql
@@ -4,5 +4,8 @@ CREATE FUNCTION tSQLt.Private_GetExternalAccessKeyBytes()
 RETURNS TABLE
 AS
 RETURN
-  SELECT 0x000000 AS ExternalAccessKeyBytes, 0x000001 AS ExternalAccessKeyThumbPrint;
+  SELECT 
+0x000000 
+  AS ExternalAccessKeyBytes, 
+  0x000001 AS ExternalAccessKeyThumbPrint;
 GO
diff --git a/Source/tSQLtCLR.mdl.sql b/Source/tSQLtCLR.mdl.sql
index 4f8c4b3a1..8dfadf3a8 100644
--- a/Source/tSQLtCLR.mdl.sql
+++ b/Source/tSQLtCLR.mdl.sql
@@ -1,4 +1,9 @@
 ---Build+
 GO
-CREATE ASSEMBLY [tSQLtCLR] AUTHORIZATION [dbo] FROM 0x000000 WITH PERMISSION_SET = SAFE;
+DECLARE @cmd NVARCHAR(MAX) = '';
+SET @cmd = @cmd + --<-- force NVARCHAR(MAX)
+'CREATE ASSEMBLY [tSQLtCLR] AUTHORIZATION [dbo] FROM '+
+'0x000000'+
+' WITH PERMISSION_SET = SAFE;';
+EXEC(@cmd);
 GO
diff --git a/Tests.EXTERNAL_ACCESS_KEY_EXISTS/EnableExternalAccessTests.class.sql b/Tests.EXTERNAL_ACCESS_KEY_EXISTS/EnableExternalAccessTests.class.sql
index b188e2e84..d43de3e06 100644
--- a/Tests.EXTERNAL_ACCESS_KEY_EXISTS/EnableExternalAccessTests.class.sql
+++ b/Tests.EXTERNAL_ACCESS_KEY_EXISTS/EnableExternalAccessTests.class.sql
@@ -18,8 +18,11 @@ AS
 BEGIN
   ALTER ASSEMBLY tSQLtCLR WITH PERMISSION_SET = SAFE;
   EXEC master.tSQLt_testutil.tSQLtTestUtil_ExternalAccessRevoke;
-
-  EXEC tSQLt.ExpectException @ExpectedMessagePattern = 'The attempt to enable tSQLt features requiring EXTERNAL_ACCESS failed: ALTER ASSEMBLY%tSQLtCLR%failed%EXTERNAL_ACCESS%';
+  DECLARE @ExpectedMessagePattern NVARCHAR(MAX) =  
+              'The attempt to enable tSQLt features requiring EXTERNAL_ACCESS failed: ALTER ASSEMBLY%tSQLtCLR%failed%'+
+              CASE WHEN CAST(SERVERPROPERTY('ProductMajorVersion')AS INT)>=14 THEN 'UNSAFE ASSEMBLY' ELSE 'EXTERNAL_ACCESS' END+
+              '%';
+  EXEC tSQLt.ExpectException @ExpectedMessagePattern = @ExpectedMessagePattern;
   EXEC tSQLt.EnableExternalAccess;
 END;
 GO
diff --git a/Tests/ExpectNoExceptionTests.class.sql b/Tests/ExpectNoExceptionTests.class.sql
index 23e60e6ab..eeb8951f5 100644
--- a/Tests/ExpectNoExceptionTests.class.sql
+++ b/Tests/ExpectNoExceptionTests.class.sql
@@ -25,7 +25,9 @@ BEGIN
 
     DECLARE @ExpectedMessage NVARCHAR(MAX);
     SET @ExpectedMessage = 'Expected no error to be raised. Instead this error was encountered:'+CHAR(13)+CHAR(10)+
-                           'test error message[[]16,10]{TestExpectingNoException,1}';
+                           'test error message[[]16,10]{'+
+                           CASE WHEN CAST(SERVERPROPERTY('ProductMajorVersion')AS INT) >= 14 THEN 'MyTestClass.' ELSE '' END+
+                           'TestExpectingNoException,1}';
     EXEC tSQLt_testutil.AssertTestFails 'MyTestClass.TestExpectingNoException', @ExpectedMessage;
 END;
 GO
diff --git a/Tests/NewTestClassTests.class.sql b/Tests/NewTestClassTests.class.sql
index ce7e1085f..0543439cd 100644
--- a/Tests/NewTestClassTests.class.sql
+++ b/Tests/NewTestClassTests.class.sql
@@ -39,7 +39,11 @@ BEGIN
       SET @Err = ERROR_MESSAGE();
     END CATCH
     
-    IF @Err NOT LIKE '%Attempted to execute tSQLt.NewTestClass on ''MySchema'' which is an existing schema but not a test class%(Error originated in Private_DisallowOverwritingNonTestSchema)%'
+    DECLARE @ExpectedErr NVARCHAR(MAX) =
+        '%Attempted to execute tSQLt.NewTestClass on ''MySchema'' which is an existing schema but not a test class%(Error originated in '+
+        CASE WHEN CAST(SERVERPROPERTY('ProductMajorVersion')AS INT) >= 14 THEN 'tSQLt.' ELSE '' END+
+        'Private_DisallowOverwritingNonTestSchema)%'
+    IF @Err NOT LIKE @ExpectedErr
     BEGIN
         EXEC tSQLt.Fail 'Unexpected error message was: ', @Err;
     END;
@@ -59,7 +63,8 @@ BEGIN
       SET @ErrProc = ERROR_PROCEDURE();
     END CATCH
     
-    EXEC tSQLt.AssertEqualsString 'NewTestClass', @ErrProc;
+    DECLARE @ExpectedErrProc NVARCHAR(MAX) = CASE WHEN CAST(SERVERPROPERTY('ProductMajorVersion')AS INT) >= 14 THEN 'tSQLt.' ELSE '' END + 'NewTestClass'
+    EXEC tSQLt.AssertEqualsString @ExpectedErrProc, @ErrProc;
 END;
 GO
 
diff --git a/Tests/Private_ScriptIndexTests.class.sql b/Tests/Private_ScriptIndexTests.class.sql
index 9f6b7b5fd..5a57fc2a3 100644
--- a/Tests/Private_ScriptIndexTests.class.sql
+++ b/Tests/Private_ScriptIndexTests.class.sql
@@ -8,15 +8,31 @@ CREATE PROCEDURE Private_ScriptIndexTests.[assert index is scripted correctly]
   @index_name NVARCHAR(MAX) = 'Private_ScriptIndexTests.T1 - IDX1'
 AS
 BEGIN
-  EXEC(@setup1);
-  EXEC(@index_create_cmd);
-  EXEC(@setup2);
+  BEGIN TRY
+    EXEC(@setup1);
+    EXEC(@index_create_cmd);
+    EXEC(@setup2);
 
-  DECLARE @ScriptedCmd NVARCHAR(MAX);
-  SELECT @ScriptedCmd = create_cmd
-    FROM tSQLt.Private_ScriptIndex(OBJECT_ID(@object_name),(SELECT index_id FROM sys.indexes AS I WHERE I.name = @index_name AND I.object_id = OBJECT_ID(@object_name)));
+    DECLARE @ScriptedCmd NVARCHAR(MAX);
+    DECLARE @object_id INT = OBJECT_ID(@object_name);
+    DECLARE @index_id INT = (SELECT index_id FROM sys.indexes AS I WHERE I.name = @index_name AND I.object_id = OBJECT_ID(@object_name));
 
-  EXEC tSQLt.AssertEqualsString @Expected = @index_create_cmd, @Actual = @ScriptedCmd;
+    SELECT @ScriptedCmd = create_cmd
+      FROM tSQLt.Private_ScriptIndex(@object_id,@index_id);
+
+    EXEC tSQLt.AssertEqualsString @Expected = @index_create_cmd, @Actual = @ScriptedCmd;
+  END TRY
+  BEGIN CATCH
+    DECLARE 
+      @EL NVARCHAR(MAX) = CAST(ERROR_LINE() AS NVARCHAR(MAX)),
+      @EM NVARCHAR(MAX) = ERROR_MESSAGE(),
+      @EN NVARCHAR(MAX) = CAST(ERROR_NUMBER() AS NVARCHAR(MAX)),
+      @EP NVARCHAR(MAX) = ERROR_PROCEDURE(),
+      @ES NVARCHAR(MAX) = CAST(ERROR_SEVERITY() AS NVARCHAR(MAX)),
+      @ET NVARCHAR(MAX) = CAST(ERROR_STATE() AS NVARCHAR(MAX));
+    RAISERROR('<EN>%s</EN><EM>%s</EM><ES>%s</ES><ET>%s</ET><EP>%s</EP><EL>%s</EL>',16,10,@EN,@EM,@ES,@ET,@EP,@EL)WITH NOWAIT;
+  END CATCH;
+  RETURN;
 END;
 GO
 CREATE PROCEDURE Private_ScriptIndexTests.[test scripts simple index]
diff --git a/Tests/Run_Methods_Tests.class.sql b/Tests/Run_Methods_Tests.class.sql
index 04e39cdff..7a87b02f9 100644
--- a/Tests/Run_Methods_Tests.class.sql
+++ b/Tests/Run_Methods_Tests.class.sql
@@ -72,12 +72,14 @@ BEGIN
         SET @ErrorRaised = 1;
     END CATCH
     SELECT Class, TestCase, Msg 
-      INTO actual
+      INTO Run_Methods_Tests.actual
       FROM tSQLt.TestResult;
-    SELECT 'MyTestClass' Class, 'Test Case A' TestCase, 'GotHere[16,10]{Test Case A,1}' Msg
-      INTO expected;
+    SELECT TOP(0)* INTO Run_Methods_Tests.expected FROM  Run_Methods_Tests.actual;
+
+    INSERT INTO Run_Methods_Tests.expected
+    SELECT 'MyTestClass' Class, 'Test Case A' TestCase, 'GotHere[16,10]{'+CASE WHEN CAST(SERVERPROPERTY('ProductMajorVersion')AS INT) >= 14 THEN 'MyTestClass.' ELSE '' END+'Test Case A,1}' Msg
     
-    EXEC tSQLt.AssertEqualsTable 'expected', 'actual';
+    EXEC tSQLt.AssertEqualsTable 'Run_Methods_Tests.expected', 'Run_Methods_Tests.actual';
 END;
 GO
 
@@ -677,7 +679,7 @@ BEGIN
     INSERT INTO tSQLt.TestResult (Class, TestCase, Result, TestStartTime, TestEndTime)
     VALUES ('MyTestClass2', 'testC', 'Failure', '2015-07-24T00:00:01.111', '2015-08-17T20:31:24.758');
     INSERT INTO tSQLt.TestResult (Class, TestCase, Result, TestStartTime, TestEndTime)
-    VALUES ('MyTestClass2', 'testD', 'Error', '2015-07-24T00:00:01.666', '2015-07-24T00:00:01.669');
+    VALUES ('MyTestClass2', 'testD', 'Error', '2015-07-24T00:00:01.664', '2015-07-24T00:00:01.667');
     
     EXEC tSQLt.XmlResultFormatter;
     
diff --git a/Tests/tSQLt_test.class.sql b/Tests/tSQLt_test.class.sql
index f009c5fc5..86519708a 100644
--- a/Tests/tSQLt_test.class.sql
+++ b/Tests/tSQLt_test.class.sql
@@ -98,30 +98,30 @@ AS
 BEGIN
     DECLARE @TranName sysname; 
     SELECT TOP(1) @TranName = TranName FROM tSQLt.TestResult WHERE Class = 'tSQLt_test' AND TestCase = 'test_Run_handles_uncommitable_transaction' ORDER BY Id DESC;
-    EXEC ('CREATE PROC testUncommitable AS BEGIN CREATE TABLE t1 (i int); CREATE TABLE t1 (i int); END;');
+    EXEC ('CREATE PROC tSQLt_test.testUncommitable00A1030051764AE7A946E827159E7063 AS BEGIN CREATE TABLE t1 (i int); CREATE TABLE t1 (i int); END;');
     BEGIN TRY
-        EXEC tSQLt.Run 'testUncommitable';
+        EXEC tSQLt.Run 'tSQLt_test.testUncommitable00A1030051764AE7A946E827159E7063';
     END TRY
     BEGIN CATCH
+      --SELECT * FROM tSQLt.TestResult WHERE TestCase = 'testUncommitable00A1030051764AE7A946E827159E7063';
       IF NOT EXISTS(SELECT 1
                       FROM tSQLt.TestResult
-                     WHERE TestCase = 'testUncommitable'
+                     WHERE TestCase = 'testUncommitable00A1030051764AE7A946E827159E7063'
                        AND Result = 'Error'
-                       AND Msg LIKE '%There is already an object named ''t1'' in the database.[[]%]{testUncommitable,1}%'
+                       AND Msg LIKE '%There is already an object named ''t1'' in the database.[[]%]{'+
+                                     CASE WHEN CAST(SERVERPROPERTY('ProductMajorVersion')AS INT) >= 14 THEN 'tSQLt_test.' ELSE '' END+
+                                     'testUncommitable00A1030051764AE7A946E827159E7063,1}%'
                        AND Msg LIKE '%The current transaction cannot be committed and cannot be rolled back to a savepoint.%'
                    )
       BEGIN
-        EXEC tSQLt.Fail 'tSQLt.Run ''testUncommitable'' did not error correctly';
+        EXEC tSQLt.Fail 'tSQLt.Run ''tSQLt_test.testUncommitable00A1030051764AE7A946E827159E7063'' did not error correctly';
       END;
       IF(@@TRANCOUNT > 0)
       BEGIN
-        EXEC tSQLt.Fail 'tSQLt.Run ''testUncommitable'' did not rollback the transactions';
+        EXEC tSQLt.Fail 'tSQLt.Run ''tSQLt_test.testUncommitable00A1030051764AE7A946E827159E7063'' did not rollback the transactions';
       END
       DELETE FROM tSQLt.TestResult
-             WHERE TestCase = 'testUncommitable'
-               AND Result = 'Error'
-               AND Msg LIKE '%There is already an object named ''t1'' in the database.[[]%]{testUncommitable,1}%'
-               AND Msg LIKE '%The current transaction cannot be committed and cannot be rolled back to a savepoint.%'
+             WHERE TestCase = 'testUncommitable00A1030051764AE7A946E827159E7063'
       BEGIN TRAN
       SAVE TRAN @TranName
     END CATCH
diff --git a/tSQLt.ssmssln b/tSQLt.ssmssln
index 1b41948b2..d73ec0227 100644
--- a/tSQLt.ssmssln
+++ b/tSQLt.ssmssln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# SQL Server Management Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
+# SQL Server Management Studio Solution File, Format Version 18.00
+VisualStudioVersion = 15.0.28307.421
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{4F2E2C19-372F-40D8-9FA7-9D2138C6997A}") = "Source", "Source\Source.ssmssqlproj", "{E5760F57-8934-4790-8420-DA7032D58EB7}"
 EndProject
 Project("{4F2E2C19-372F-40D8-9FA7-9D2138C6997A}") = "Tests", "Tests\Tests.ssmssqlproj", "{5FFBD87D-F3CF-43CF-BD60-ED175F5B0E92}"
@@ -34,6 +36,7 @@ Global
 		Default|Default = Default|Default
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FEF7B31A-9D13-4AF3-8B01-C68B7D02348A}.Default|Default.ActiveCfg = Default
 		{E5760F57-8934-4790-8420-DA7032D58EB7}.Default|Default.ActiveCfg = Default
 		{5FFBD87D-F3CF-43CF-BD60-ED175F5B0E92}.Default|Default.ActiveCfg = Default
 		{161EC148-F99F-4D07-A8A0-FF7ECB9A1566}.Default|Default.ActiveCfg = Default
@@ -47,10 +50,12 @@ Global
 		{E2A27030-663A-4CA8-AAEB-DE8E2D2C1602}.Default|Default.ActiveCfg = Default
 		{C3E63571-5B2C-4FF0-9FE4-96BB08BEDC7B}.Default|Default.ActiveCfg = Default
 		{7FC3A926-9834-455A-906E-330FFCF224E3}.Default|Default.ActiveCfg = Default
-		{A48D69DD-2543-46B6-9C85-4AF95F95C33A}.Default|Default.ActiveCfg = Default
 		{92395F13-BF15-4C42-A876-DC851DE88ACA}.Default|Default.ActiveCfg = Default
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {90FA238E-F2FF-4145-9BD0-3AA0CE7B719F}
+	EndGlobalSection
 EndGlobal
diff --git a/tSQLtCLR/OfficialSigningKey/tSQLtOfficialSigningKey.pfx b/tSQLtCLR/OfficialSigningKey/tSQLtOfficialSigningKey.pfx
new file mode 100644
index 000000000..83fb8fcb9
Binary files /dev/null and b/tSQLtCLR/OfficialSigningKey/tSQLtOfficialSigningKey.pfx differ
diff --git a/tSQLtCLR/UnsignedEmpty/Properties/AssemblyInfo.cs b/tSQLtCLR/UnsignedEmpty/Properties/AssemblyInfo.cs
index 772411e0e..dcaa55132 100644
--- a/tSQLtCLR/UnsignedEmpty/Properties/AssemblyInfo.cs
+++ b/tSQLtCLR/UnsignedEmpty/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("UnsignedEmpty")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj b/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj
index acba563a1..0c9bd76b8 100644
--- a/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj
+++ b/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj
@@ -38,6 +38,9 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoSigningForCI|AnyCPU'">
+    <OutputPath>bin\NoSigningForCI\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/tSQLtCLR/tSQLtCLR.sln b/tSQLtCLR/tSQLtCLR.sln
index 144aceec0..b7964b3c4 100644
--- a/tSQLtCLR/tSQLtCLR.sln
+++ b/tSQLtCLR/tSQLtCLR.sln
@@ -13,26 +13,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnsignedEmpty", "UnsignedEm
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CI(NoSigning)|Any CPU = CI(NoSigning)|Any CPU
-		CI(NoSigning)|Mixed Platforms = CI(NoSigning)|Mixed Platforms
-		CI(NoSigning)|x86 = CI(NoSigning)|x86
 		CruiseControl|Any CPU = CruiseControl|Any CPU
 		CruiseControl|Mixed Platforms = CruiseControl|Mixed Platforms
 		CruiseControl|x86 = CruiseControl|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x86 = Debug|x86
+		NoSigningForCI|Any CPU = NoSigningForCI|Any CPU
+		NoSigningForCI|Mixed Platforms = NoSigningForCI|Mixed Platforms
+		NoSigningForCI|x86 = NoSigningForCI|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
-		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
-		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|Any CPU
-		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|Any CPU
-		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|Any CPU
-		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CruiseControl|Mixed Platforms.ActiveCfg = CruiseControl|Any CPU
@@ -43,17 +37,17 @@ Global
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.NoSigningForCI|Any CPU.ActiveCfg = NoSigningForCI|Any CPU
+		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.NoSigningForCI|Any CPU.Build.0 = NoSigningForCI|Any CPU
+		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.NoSigningForCI|Mixed Platforms.ActiveCfg = NoSigningForCI|Any CPU
+		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.NoSigningForCI|Mixed Platforms.Build.0 = NoSigningForCI|Any CPU
+		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.NoSigningForCI|x86.ActiveCfg = NoSigningForCI|Any CPU
+		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.NoSigningForCI|x86.Build.0 = NoSigningForCI|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|x86.ActiveCfg = Release|Any CPU
-		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
-		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
-		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|Any CPU
-		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|Any CPU
-		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|Any CPU
-		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CruiseControl|Mixed Platforms.ActiveCfg = CruiseControl|Any CPU
@@ -64,17 +58,17 @@ Global
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.NoSigningForCI|Any CPU.ActiveCfg = NoSigningForCI|Any CPU
+		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.NoSigningForCI|Any CPU.Build.0 = NoSigningForCI|Any CPU
+		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.NoSigningForCI|Mixed Platforms.ActiveCfg = NoSigningForCI|Any CPU
+		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.NoSigningForCI|Mixed Platforms.Build.0 = NoSigningForCI|Any CPU
+		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.NoSigningForCI|x86.ActiveCfg = NoSigningForCI|Any CPU
+		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.NoSigningForCI|x86.Build.0 = NoSigningForCI|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|x86.ActiveCfg = Release|Any CPU
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|x86
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|x86
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|x86
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|x86
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CruiseControl|Mixed Platforms.ActiveCfg = CruiseControl|x86
@@ -86,17 +80,18 @@ Global
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Debug|x86.ActiveCfg = Debug|x86
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Debug|x86.Build.0 = Debug|x86
-		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|Any CPU.ActiveCfg = Release|x86
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.NoSigningForCI|Any CPU.ActiveCfg = NoSigningForCI|Any CPU
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.NoSigningForCI|Any CPU.Build.0 = NoSigningForCI|Any CPU
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.NoSigningForCI|Mixed Platforms.ActiveCfg = NoSigningForCI|x86
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.NoSigningForCI|Mixed Platforms.Build.0 = NoSigningForCI|x86
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.NoSigningForCI|x86.ActiveCfg = NoSigningForCI|x86
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.NoSigningForCI|x86.Build.0 = NoSigningForCI|x86
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|Mixed Platforms.Build.0 = Release|x86
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|x86.ActiveCfg = Release|x86
 		{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|x86.Build.0 = Release|x86
-		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
-		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
-		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|Any CPU
-		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|Any CPU
-		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|Any CPU
-		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CruiseControl|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -107,6 +102,12 @@ Global
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.NoSigningForCI|Any CPU.ActiveCfg = NoSigningForCI|Any CPU
+		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.NoSigningForCI|Any CPU.Build.0 = NoSigningForCI|Any CPU
+		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.NoSigningForCI|Mixed Platforms.ActiveCfg = NoSigningForCI|Any CPU
+		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.NoSigningForCI|Mixed Platforms.Build.0 = NoSigningForCI|Any CPU
+		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.NoSigningForCI|x86.ActiveCfg = NoSigningForCI|Any CPU
+		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.NoSigningForCI|x86.Build.0 = NoSigningForCI|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14624277-A18F-4D80-BC04-FDFCD09E13D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
diff --git a/tSQLtCLR/tSQLtCLR/SigningKey.pfx b/tSQLtCLR/tSQLtCLR/SigningKey.pfx
deleted file mode 100644
index ad8f063e8..000000000
Binary files a/tSQLtCLR/tSQLtCLR/SigningKey.pfx and /dev/null differ
diff --git a/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj b/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj
index b2e48a705..456ac1d38 100644
--- a/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj
+++ b/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj
@@ -41,6 +41,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AssemblyOriginatorKeyFile />
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -49,16 +51,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' != 'CI%28NoSigning%29' ">
+    <AssemblyOriginatorKeyFile>tSQLtOfficialSigningKey.pfx</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'CI%28NoSigning%29' ">
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SigningKey.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CruiseControl|AnyCPU'">
     <OutputPath>bin\CruiseControl\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -66,15 +61,19 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <AssemblyOriginatorKeyFile>tSQLtOfficialSigningKey.pfx</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
-    <OutputPath>bin\CI%28NoSigning%29\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoSigningForCI|AnyCPU'">
+    <OutputPath>bin\NoSigningForCI\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AssemblyOriginatorKeyFile />
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -105,10 +104,10 @@
       <LastGenOutput>AssemblyCopyright.cs</LastGenOutput>
     </None>
     <None Include="PostBuild.bat" />
-    <None Include="SigningKey.pfx" />
     <None Include="sql.proj">
       <InProject>false</InProject>
     </None>
+    <None Include="tSQLtOfficialSigningKey.pfx" />
     <None Include="typeconversion.xml">
       <InProject>false</InProject>
     </None>
diff --git a/tSQLtCLR/tSQLtCLR/tSQLtOfficialSigningKey.pfx b/tSQLtCLR/tSQLtCLR/tSQLtOfficialSigningKey.pfx
new file mode 100644
index 000000000..83fb8fcb9
Binary files /dev/null and b/tSQLtCLR/tSQLtCLR/tSQLtOfficialSigningKey.pfx differ
diff --git a/tSQLtCLR/tSQLtExternalAccessKey/Properties/AssemblyInfo.cs b/tSQLtCLR/tSQLtExternalAccessKey/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..35099c6b6
--- /dev/null
+++ b/tSQLtCLR/tSQLtExternalAccessKey/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("tSQLtExternalAccessKey")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("tSQLt")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0356005b-71fd-4df3-8502-27c6a606e9e8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tSQLtCLR/tSQLtExternalAccessKey/SigningKey.pfx b/tSQLtCLR/tSQLtExternalAccessKey/SigningKey.pfx
deleted file mode 100644
index ad8f063e8..000000000
Binary files a/tSQLtCLR/tSQLtExternalAccessKey/SigningKey.pfx and /dev/null differ
diff --git a/tSQLtCLR/tSQLtExternalAccessKey/empty.cs b/tSQLtCLR/tSQLtExternalAccessKey/empty.cs
new file mode 100644
index 000000000..d14060f0a
--- /dev/null
+++ b/tSQLtCLR/tSQLtExternalAccessKey/empty.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace tSQLtExternalAccessKey
+{
+    class empty
+    {
+    }
+}
diff --git a/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj b/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj
index de204835a..6fd9e47fe 100644
--- a/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj
+++ b/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{09611E35-7E79-4DD3-8BCD-83F27535FB5D}</ProjectGuid>
@@ -30,8 +30,8 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -39,56 +39,41 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AssemblyOriginatorKeyFile />
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' != 'CI%28NoSigning%29' ">
+    <AssemblyOriginatorKeyFile>tSQLtOfficialSigningKey.pfx</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'CI%28NoSigning%29' ">
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SigningKey.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CruiseControl|x86'">
-    <OutputPath>bin\CruiseControl\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>bin\Release\</OutputPath>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CruiseControl|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputPath>bin\CruiseControl\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|x86'">
-    <OutputPath>bin\x86\CI%28NoSigning%29\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <ErrorReport>prompt</ErrorReport>
+    <AssemblyOriginatorKeyFile>tSQLtOfficialSigningKey.pfx</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
-    <OutputPath>bin\CI%28NoSigning%29\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoSigningForCI|AnyCPU'">
+    <OutputPath>bin\NoSigningForCI\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AssemblyOriginatorKeyFile />
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="SigningKey.pfx" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
@@ -114,6 +99,13 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="empty.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="tSQLtOfficialSigningKey.pfx" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/tSQLtCLR/tSQLtExternalAccessKey/tSQLtOfficialSigningKey.pfx b/tSQLtCLR/tSQLtExternalAccessKey/tSQLtOfficialSigningKey.pfx
new file mode 100644
index 000000000..83fb8fcb9
Binary files /dev/null and b/tSQLtCLR/tSQLtExternalAccessKey/tSQLtOfficialSigningKey.pfx differ
diff --git a/tSQLtCLR/tSQLtTestUtilCLR/SigningKey.pfx b/tSQLtCLR/tSQLtTestUtilCLR/SigningKey.pfx
deleted file mode 100644
index ad8f063e8..000000000
Binary files a/tSQLtCLR/tSQLtTestUtilCLR/SigningKey.pfx and /dev/null differ
diff --git a/tSQLtCLR/tSQLtTestUtilCLR/tSQLtOfficialSigningKey.pfx b/tSQLtCLR/tSQLtTestUtilCLR/tSQLtOfficialSigningKey.pfx
new file mode 100644
index 000000000..83fb8fcb9
Binary files /dev/null and b/tSQLtCLR/tSQLtTestUtilCLR/tSQLtOfficialSigningKey.pfx differ
diff --git a/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj b/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj
index 12089adeb..bc211349d 100644
--- a/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj
+++ b/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj
@@ -22,6 +22,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AssemblyOriginatorKeyFile />
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +32,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AssemblyOriginatorKeyFile>tSQLtOfficialSigningKey.pfx</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CruiseControl|AnyCPU'">
     <OutputPath>bin\CruiseControl\</OutputPath>
@@ -38,24 +42,19 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' != 'CI%28NoSigning%29' ">
+    <AssemblyOriginatorKeyFile>tSQLtOfficialSigningKey.pfx</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'CI%28NoSigning%29' ">
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SigningKey.pfx</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
-    <OutputPath>bin\CI%28NoSigning%29\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoSigningForCI|AnyCPU'">
+    <OutputPath>bin\NoSigningForCI\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AssemblyOriginatorKeyFile />
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -80,7 +79,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="SigningKey.pfx" />
+    <None Include="tSQLtOfficialSigningKey.pfx" />
   </ItemGroup>
   <!-- Was : <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - - Why did we need to change this? -->
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />