diff --git a/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/HubConnection.spec.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/HubConnection.spec.ts
similarity index 100%
rename from client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/HubConnection.spec.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/HubConnection.spec.ts
diff --git a/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
index d6168ed936..347c683e66 100644
--- a/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
diff --git a/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs
index 74f25c6f26..50ac57fef2 100644
--- a/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.SignalR.Test.Server
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             loggerFactory.AddConsole();
+            loggerFactory.AddDebug(LogLevel.Trace);
 
             if (env.IsDevelopment())
             {
diff --git a/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js
index a5e278f995..83f27349fc 100644
--- a/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js
@@ -26,7 +26,7 @@ describe('hubConnection', () => {
                 .catch(() => {
                     fail();
                     done();
-                })
+                });
         });
 
         it(`over ${transportName} rethrows an exception from the server`, done => {
@@ -51,32 +51,32 @@ describe('hubConnection', () => {
                 .catch(() => {
                     fail();
                     done();
-                })
+                });
         });
 
         it(`over ${transportName} can receive server calls`, done => {
             let client = new signalR.HubConnection(TESTHUBENDPOINT_URL, 'formatType=json&format=text');
             const message = "Hello SignalR";
 
-            client.on("Message", msg => {
-                expect(msg).toBe(message);
-                client.stop();
-                done();
+            let callbackPromise = new Promise((resolve, reject) => {
+                client.on("Message", msg => {
+                    expect(msg).toBe(message);
+                    resolve();
+                });
             });
 
             client.start(transportName)
                 .then(() => {
-                    client.invoke('InvokeWithString', message)
-                        .catch(e => {
-                            fail();
-                            client.stop();
-                            done();
-                        });
+                    return Promise.all([client.invoke('InvokeWithString', message), callbackPromise]);
+                })
+                .then(() => {
+                    stop();
+                    done();
                 })
                 .catch(e => {
                     fail();
                     done();
-                })
+                });
         });
     });
 });
\ No newline at end of file