diff --git a/.gitignore b/.gitignore
index 46602db953..a04227128c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,7 @@ tests/Microsoft.AspNet.SignalR.Client.Store.Tests/AppPackages/
 /Microsoft.AspNet.SignalR.sln.ide
 /.vs/
 project.lock.json
-src/Microsoft.AspNet.SignalR.Client.NetStandard/Microsoft.AspNet.SignalR.Client.NetStandard.nuget.targets
\ No newline at end of file
+src/Microsoft.AspNet.SignalR.Client.NetStandard/Microsoft.AspNet.SignalR.Client.NetStandard.nuget.targets
+tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/AppPackages/
+tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.props
+tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.targets
diff --git a/.nuget/packages.config b/.nuget/packages.config
index 57a18a1cf4..1b5a12fa4e 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -4,8 +4,5 @@
   <package id="Microsoft.Bcl.Build" version="1.0.14" />
   <package id="OpenCover" version="4.5.1403" />
   <package id="ReportGenerator" version="1.7.3.0" />
-  <package id="xunit.runners" version="1.9.1" />
-  <package id="xunit.runners" version="2.0.0-beta4-build2738" />
-  <!-- don't remove or tests may not run -->
-  <package id="xunit.core" version="2.0.0-beta4-build2738" />
+  <package id="xunit.runner.msbuild" version="2.2.0" />
 </packages>
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
index 9892c671f8..adc5db6b51 100644
--- a/build.cmd
+++ b/build.cmd
@@ -3,6 +3,7 @@
 rem Enforce package restore to avoid build issues. See http://go.microsoft.com/fwlink/?LinkID=317568 for more details
 msbuild .nuget\NuGet.targets /t:RestorePackages
 .nuget\nuget.exe restore %~dp0\src\Microsoft.AspNet.SignalR.Client.UWP\project.json
+.nuget\nuget.exe restore %~dp0\tests\Microsoft.AspNet.SignalR.Client.UWP.Tests\project.json
 .nuget\nuget.exe restore %~dp0\src\Microsoft.AspNet.SignalR.Client.NetStandard\project.json
 
 set target=%1
diff --git a/build/Build.proj b/build/Build.proj
index 50dd15ef5c..c948a3bce1 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -23,7 +23,7 @@
     <NuGetToolsPath>$(ProjectRoot)\.nuget</NuGetToolsPath>
     <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
     <ToolsPath>$(ProjectRoot)\tools\</ToolsPath>
-    <XunitPath>$(ProjectRoot)\packages\xunit.runners.2.0.0-beta4-build2738\tools\</XunitPath>
+    <XunitPath>$(ProjectRoot)\packages\xunit.runner.msbuild.2.2.0\build\net452\</XunitPath>
     <ChutzpahExe>chutzpah.console.exe</ChutzpahExe>
     <ChutzpahPath>$(ProjectRoot)\tools\chutzpah</ChutzpahPath>
     <ChutzpahExePath>$(ChutzpahPath)\$(ChutzpahExe)</ChutzpahExePath>
@@ -165,8 +165,9 @@
     <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.csproj"></UnitTestProjects>
     <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.csproj"></UnitTestProjects>
     <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.SqlServer.Tests\Microsoft.AspNet.SignalR.SqlServer.Tests.csproj"></UnitTestProjects>
-    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.Store.TestHost\Microsoft.AspNet.SignalR.Client.Store.TestHost.csproj"></UnitTestProjects>
-    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.Store.Tests\Microsoft.AspNet.SignalR.Client.Store.Tests.csproj"></UnitTestProjects>
+    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Redis.Tests\Microsoft.AspNet.SignalR.Redis.Tests.csproj"></UnitTestProjects>
+    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.Store.TestHost\Microsoft.AspNet.SignalR.Client.UWP.TestHost.csproj"></UnitTestProjects>
+    <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.UWP.Tests\Microsoft.AspNet.SignalR.Client.UWP.Tests.csproj"></UnitTestProjects>
     <UnitTestProjects Include="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.Portable.Tests\Microsoft.AspNet.SignalR.Client.Portable.Tests.csproj"></UnitTestProjects>
   </ItemGroup>
 
@@ -236,31 +237,28 @@
   </Target>
 
   <Target Name="RunNetUnitTests" DependsOnTargets="BuildNetUnitTests">
-
     <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.dll"
-           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Tests.XunitResults.xml"
-           Verbose="true" />
+           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Tests.XunitResults.xml" />
 
     <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.Tests\Microsoft.AspNet.SignalR.Client.Tests.dll"
-       Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Tests.XunitResults.xml"
-       Verbose="true" />
+       Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Tests.XunitResults.xml" />
 
     <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.SqlServer.Tests\Microsoft.AspNet.SignalR.SqlServer.Tests.dll"
-           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.SqlServer.Tests.XunitResults.xml"
-           Verbose="true" />
+           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.SqlServer.Tests.XunitResults.xml" />
+
+    <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Redis.Tests\Microsoft.AspNet.SignalR.Redis.Tests.dll"
+           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Redis.Tests.XunitResults.xml" />
 
-    <!-- Microsoft.AspNet.SignalR.Client.Store.TestHost.exe is a host required to run some functional Store tests -->
-    <ExecAsync Executable="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.Store.TestHost\Microsoft.AspNet.SignalR.Client.Store.TestHost.exe" Arguments="600000" />
+    <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.Portable.Tests\Microsoft.AspNet.SignalR.Client.Portable.Tests.dll"
+           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Portable.Tests.XunitResults.xml" />
 
-    <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.Store.Tests\Microsoft.AspNet.SignalR.Client.Store.Tests.dll"
-           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Store.Tests.XunitResults.xml"
-           Verbose="true" />
+    <!-- Microsoft.AspNet.SignalR.Client.UWP.TestHost.exe is a host required to run some functional UWP tests -->
+    <ExecAsync Executable="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.UWP.TestHost\Microsoft.AspNet.SignalR.Client.UWP.TestHost.exe" Arguments="600000" />
 
-    <Exec Command="taskkill /IM Microsoft.AspNet.SignalR.Client.Store.TestHost.exe /F" ContinueOnError="true" />
+    <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.UWP.Tests\Microsoft.AspNet.SignalR.Client.UWP.Tests.exe"
+           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Store.Tests.XunitResults.xml" />
 
-    <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Client.Portable.Tests\Microsoft.AspNet.SignalR.Client.Portable.Tests.dll"
-           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Client.Portable.Tests.XunitResults.xml"
-           Verbose="true" />
+    <Exec Command="taskkill /IM Microsoft.AspNet.SignalR.Client.UWP.TestHost.exe /F" ContinueOnError="true" />
 
   </Target>
 
@@ -290,7 +288,7 @@
 
   </Target>
 
-  <Target Name="RunUnitTests" DependsOnTargets="RunJSUnitTests; RunNetUnitTests" />
+  <Target Name="RunUnitTests" DependsOnTargets="RunNetUnitTests; RunJSUnitTests;" />
 
   <Target Name="BuildNetFunctionalTests" DependsOnTargets="CreateOutputDirs">
     <MSBuild Projects="%(FunctionalTestProjects.Identity)"
@@ -301,8 +299,7 @@
 
   <Target Name="RunFunctionalTests" DependsOnTargets="BuildNetFunctionalTests">
     <xunit Assemblies="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.FunctionalTests\bin\Microsoft.AspNet.SignalR.FunctionalTests.dll"
-           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.FunctionalTests.XunitResults.xml"
-           Verbose="true" />
+           Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.FunctionalTests.XunitResults.xml" />
 
     <CallTarget Targets="KillIISExpress; AnalyzeLogs" />
     <OnError ExecuteTargets="KillIISExpress; AnalyzeLogs" />
diff --git a/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBus.cs b/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBus.cs
index 808a66f046..d082c81f45 100644
--- a/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBus.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBus.cs
@@ -152,7 +152,7 @@ public virtual Task Publish(Message message)
             if (Topics.TryGetValue(message.Key, out topic))
             {
                 topic.Store.Add(message);
-                ScheduleTopic(message.Key, topic);
+                ScheduleTopic(topic);
             }
 
             Counters.MessageBusMessagesPublishedTotal.Increment();
@@ -258,11 +258,11 @@ protected void ScheduleEvent(string eventKey)
             Topic topic;
             if (Topics.TryGetValue(eventKey, out topic))
             {
-                ScheduleTopic(eventKey, topic);
+                ScheduleTopic(topic);
             }
         }
 
-        private void ScheduleTopic(string eventKey, Topic topic)
+        private void ScheduleTopic(Topic topic)
         {
             try
             {
diff --git a/src/Microsoft.AspNet.SignalR.Redis/RedisScaleoutConfiguration.cs b/src/Microsoft.AspNet.SignalR.Redis/RedisScaleoutConfiguration.cs
index 07e037a1a3..ff4c6e1700 100644
--- a/src/Microsoft.AspNet.SignalR.Redis/RedisScaleoutConfiguration.cs
+++ b/src/Microsoft.AspNet.SignalR.Redis/RedisScaleoutConfiguration.cs
@@ -31,7 +31,7 @@ public RedisScaleoutConfiguration(string connectionString, string eventKey)
             }
 
             ConnectionString = connectionString;
-            if (connectionString != string.Empty)
+            if (connectionString.Length > 0)
             {
                 var options = ConfigurationOptions.Parse(connectionString);
                 Database = options.DefaultDatabase.GetValueOrDefault(0);
diff --git a/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Microsoft.AspNet.SignalR.Client.UWP.TestHost.csproj b/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Microsoft.AspNet.SignalR.Client.UWP.TestHost.csproj
index a888d1a794..b37d86fe15 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Microsoft.AspNet.SignalR.Client.UWP.TestHost.csproj
+++ b/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Microsoft.AspNet.SignalR.Client.UWP.TestHost.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.AspNet.SignalR.Client.Store.TestHost</RootNamespace>
-    <AssemblyName>Microsoft.AspNet.SignalR.Client.Store.TestHost</AssemblyName>
+    <AssemblyName>Microsoft.AspNet.SignalR.Client.UWP.TestHost</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
diff --git a/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Program.cs b/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Program.cs
index d01d477101..a189ab8957 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Program.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/Program.cs
@@ -6,7 +6,7 @@
 using Microsoft.Owin.Hosting;
 using Owin;
 
-namespace Microsoft.AspNet.SignalR.Client.Store.TestHost
+namespace Microsoft.AspNet.SignalR.Client.UWP.TestHost
 {
     // Used for running End-to-End tests for Store WebSockets transport.
     public class Program
@@ -16,7 +16,7 @@ static void Main(string[] args)
             const string url = "http://localhost:42424";
             using (WebApp.Start(url))
             {
-                Console.WriteLine("SignalR host for E2E Store Client tests running on {0}", url);
+                Console.WriteLine("SignalR host for E2E UWP Client tests running on {0}", url);
                 Thread.Sleep(args.Length > 0 ? int.Parse(args[0]) : Timeout.Infinite);
             }
         }
diff --git a/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/StoreWebSocketTestHub.cs b/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/StoreWebSocketTestHub.cs
index ddfd03ca9e..6e3869b753 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/StoreWebSocketTestHub.cs
+++ b/tests/Microsoft.AspNet.SignalR.Client.Store.TestHost/StoreWebSocketTestHub.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System;
 
-namespace Microsoft.AspNet.SignalR.Client.Store.TestHost
+namespace Microsoft.AspNet.SignalR.Client.UWP.TestHost
 {
     public class StoreWebSocketTestHub : Hub
     {
diff --git a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.csproj b/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.csproj
index 111532069c..58c4f8409a 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.csproj
+++ b/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.csproj
@@ -147,6 +147,7 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <Import Project="..\..\src\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.props b/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.props
deleted file mode 100644
index 5e640e857f..0000000000
--- a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\xunit.core\2.2.0\build\uap10.0\xunit.core.props" Condition="Exists('$(NuGetPackageRoot)\xunit.core\2.2.0\build\uap10.0\xunit.core.props')" />
-    <Import Project="$(NuGetPackageRoot)\xunit.runner.visualstudio\2.2.0\build\uap10.0\xunit.runner.visualstudio.props" Condition="Exists('$(NuGetPackageRoot)\xunit.runner.visualstudio\2.2.0\build\uap10.0\xunit.runner.visualstudio.props')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.targets b/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.targets
deleted file mode 100644
index dca8b12941..0000000000
--- a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/Microsoft.AspNet.SignalR.Client.UWP.Tests.nuget.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\xunit.runner.visualstudio\2.2.0\build\uap10.0\xunit.runner.visualstudio.targets" Condition="Exists('$(NuGetPackageRoot)\xunit.runner.visualstudio\2.2.0\build\uap10.0\xunit.runner.visualstudio.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/project.json b/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/project.json
index 648833d21d..7779ec0a70 100644
--- a/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/project.json
+++ b/tests/Microsoft.AspNet.SignalR.Client.UWP.Tests/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
+    "Newtonsoft.Json": "6.0.8",
     "xunit": "2.2.0",
     "xunit.runner.visualstudio": "2.2.0"
   },
diff --git a/tests/Microsoft.AspNet.SignalR.Redis.Tests/Microsoft.AspNet.SignalR.Redis.Tests.csproj b/tests/Microsoft.AspNet.SignalR.Redis.Tests/Microsoft.AspNet.SignalR.Redis.Tests.csproj
index 35c7e9e1ba..0ecf406d04 100644
--- a/tests/Microsoft.AspNet.SignalR.Redis.Tests/Microsoft.AspNet.SignalR.Redis.Tests.csproj
+++ b/tests/Microsoft.AspNet.SignalR.Redis.Tests/Microsoft.AspNet.SignalR.Redis.Tests.csproj
@@ -85,6 +85,7 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <Import Project="..\..\src\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">