diff --git a/test/commands/hello/org.test.ts b/test/commands/hello/org.test.ts
index 423181e..1806a04 100644
--- a/test/commands/hello/org.test.ts
+++ b/test/commands/hello/org.test.ts
@@ -1,14 +1,19 @@
-import { expect, test } from '@salesforce/command/dist/test';
+import { expect, test } from '@salesforce/command/lib/test';
+import { ensureJsonMap, ensureString } from '@salesforce/ts-types';
 
 describe('hello:org', () => {
   test
     .withOrg({ username: 'test@org.com' }, true)
-    .withConnectionRequest(function() {
-      return Promise.resolve({ records: [ { Name: 'Super Awesome Org', TrialExpirationDate: '2018-03-20T23:24:11.000+0000'}]});
+    .withConnectionRequest(request => {
+      const requestMap = ensureJsonMap(request);
+      if (ensureString(requestMap.url).match(/Organization/)) {
+        return Promise.resolve({ records: [ { Name: 'Super Awesome Org', TrialExpirationDate: '2018-03-20T23:24:11.000+0000'}] });
+      }
+      return Promise.resolve({ records: [] });
     })
     .stdout()
     .command(['hello:org', '--targetusername', 'test@org.com'])
-    .it('runs hello:org --targetusername test@org.com', (ctx) => {
+    .it('runs hello:org --targetusername test@org.com', ctx => {
       expect(ctx.stdout).to.contain('Hello world! This is org: Super Awesome Org and I will be around until Tue Mar 20 2018!');
     });
 });