diff --git a/__tests__/test-tsconfig.json b/__tests__/tsconfig.json
similarity index 100%
rename from __tests__/test-tsconfig.json
rename to __tests__/tsconfig.json
diff --git a/package.json b/package.json
index 7f7a132acb..6e6402c9f0 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "clean": "lerna run --parallel clean",
     "clean:exe": "cd zowex && cargo clean",
     "installWithBuild": "npm install && npm run build",
-    "checkTestsCompile": "echo \"Checking that test source compiles...\" && tsc --project __tests__/test-tsconfig.json --noEmit",
+    "checkTestsCompile": "echo \"Checking that test source compiles...\" && tsc --project __tests__/tsconfig.json --noEmit",
     "circularDependencyCheck": "lerna run --parallel circularDependencyCheck -- -- --warning --no-spinner",
     "lint": "eslint \"packages/**/*.ts\" \"**/__tests__/**/*.ts\"",
     "lint:packages": "eslint \"packages/**/*.ts\" --ignore-pattern \"**/__tests__/**/*.ts\"",
diff --git a/packages/cli/__tests__/tsconfig.json b/packages/cli/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/cli/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/cli/__tests__/zosfiles/__system__/compare/ds/Compare.ds.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/compare/ds/Compare.ds.system.test.ts
index 5b0060e0cc..112a0015d6 100644
--- a/packages/cli/__tests__/zosfiles/__system__/compare/ds/Compare.ds.system.test.ts
+++ b/packages/cli/__tests__/zosfiles/__system__/compare/ds/Compare.ds.system.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Session } from "@zowe/imperative";
-import { Create, Delete, CreateDataSetTypeEnum, Upload } from "@zowe/cli";
+import { Create, Delete, CreateDataSetTypeEnum, Upload } from "@zowe/zos-files-for-zowe-sdk";
 import * as path from "path";
 import {ITestEnvironment, runCliScript} from "@zowe/cli-test-utils";
 import {TestEnvironment} from "../../../../../../../__tests__/__src__/environment/TestEnvironment";
diff --git a/packages/cli/__tests__/zosfiles/__system__/view/ds/View.ds.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/view/ds/View.ds.system.test.ts
index 94d832ccd8..d1f7f0295c 100644
--- a/packages/cli/__tests__/zosfiles/__system__/view/ds/View.ds.system.test.ts
+++ b/packages/cli/__tests__/zosfiles/__system__/view/ds/View.ds.system.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Session } from "@zowe/imperative";
-import { Create, Delete, CreateDataSetTypeEnum } from "@zowe/cli";
+import { Create, Delete, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
 import * as path from "path";
 import {ITestEnvironment, runCliScript} from "@zowe/cli-test-utils";
 import {TestEnvironment} from "../../../../../../../__tests__/__src__/environment/TestEnvironment";
diff --git a/packages/cli/__tests__/zosfiles/__system__/view/uss/View.uss.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/view/uss/View.uss.system.test.ts
index fc7f3f154b..fb24c75c54 100644
--- a/packages/cli/__tests__/zosfiles/__system__/view/uss/View.uss.system.test.ts
+++ b/packages/cli/__tests__/zosfiles/__system__/view/uss/View.uss.system.test.ts
@@ -12,7 +12,8 @@
 
 import { Imperative, Session } from "@zowe/imperative";
 import * as path from "path";
-import { ZosFilesConstants, ZosmfRestClient, ZosmfHeaders } from "@zowe/cli";
+import { ZosFilesConstants } from "../../../../../../zosfiles/src/constants/ZosFiles.constants";
+import { ZosmfHeaders, ZosmfRestClient } from "@zowe/core-for-zowe-sdk";
 import {ITestEnvironment, runCliScript} from "@zowe/cli-test-utils";
 import {TestEnvironment} from "../../../../../../../__tests__/__src__/environment/TestEnvironment";
 import {ITestPropertiesSchema} from "../../../../../../../__tests__/__src__/properties/ITestPropertiesSchema";
diff --git a/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap
index 0ce860177a..24c7d70612 100644
--- a/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap
+++ b/packages/cli/__tests__/zostso/__system__/ping/__snapshots__/cli.zos-tso.ping.address-space.system.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`zos-tso ping address-space should throw an error if provided address space is inactive 1`] = `
-"Command Error:
+"Unable to perform this operation due to the following problem.
 Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"BadKey\\" with an active z/OS application session.
 "
 `;
diff --git a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap
index 48674f0023..e119838be2 100644
--- a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap
+++ b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.address-space.system.test.ts.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`zos-tso start address-space should throw an error if provided address space is inactive 1`] = `
-"Command Error:
+"Unable to perform this operation due to the following problem.
 Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"ZOSMFAD-55-aaakaaac\\" with an active z/OS application session.
 "
 `;
 
 exports[`zos-tso start address-space should throw an error if servlet key parameter is not provided 1`] = `
-"Command Error:
+"Unable to perform this operation due to the following problem.
 Expect Error: IZUG1126E: z/OSMF cannot correlate the request for key \\"ZOSMFAD-55-aaakaaac\\" with an active z/OS application session.
 "
 `;
diff --git a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap
index 21484fcd84..aab1477817 100644
--- a/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap
+++ b/packages/cli/__tests__/zostso/__system__/stop/__snapshots__/cli.zos-tso.stop.system.test.ts.snap
@@ -1,13 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`zos-tso stop should fail with invalid option 1`] = `
-"Command Error:
+"Unable to perform this operation due to the following problem.
 Unknown arguments: foo-bar, fooBar
 Command failed due to improper syntax
 Command entered: \\"zos-tso start as --foo-bar\\"
 Available commands are \\"address-space\\".
 Use \\"zowe zos-tso start --help\\" to view groups, commands, and options.
-Error Details:
+
+Response From Service
+Error: Unknown arguments: foo-bar, fooBar
+
+Diagnostic Information
 Unknown arguments: foo-bar, fooBar
 "
 `;
@@ -18,7 +22,7 @@ exports[`zos-tso stop should fail with invalid option 2`] = `
 `;
 
 exports[`zos-tso stop should fail with invalid parameter 1`] = `
-"Command Error:
+"Unable to perform this operation due to the following problem.
 Unknown argument: foobar
 Command failed due to improper syntax
 Did you mean: zos-tso stop as?
@@ -26,7 +30,11 @@ Did you mean: zos-tso stop as?
 Command entered: \\"zos-tso stop foobar\\"
 Available commands are \\"address-space\\".
 Use \\"zowe zos-tso stop --help\\" to view groups, commands, and options.
-Error Details:
+
+Response From Service
+Error: Unknown argument: foobar
+
+Diagnostic Information
 Unknown argument: foobar
 "
 `;
diff --git a/packages/cli/test-tsconfig.json b/packages/cli/test-tsconfig.json
new file mode 100644
index 0000000000..fdfdb95a1d
--- /dev/null
+++ b/packages/cli/test-tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./lib"
+  },
+  "include": [
+    "./src"
+  ]
+}
\ No newline at end of file
diff --git a/packages/core/__tests__/tsconfig.json b/packages/core/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/core/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/imperative/__tests__/__integration__/cmd/tsconfig.json b/packages/imperative/__tests__/__integration__/cmd/tsconfig.json
index aabcf2e612..d44372f4c1 100644
--- a/packages/imperative/__tests__/__integration__/cmd/tsconfig.json
+++ b/packages/imperative/__tests__/__integration__/cmd/tsconfig.json
@@ -7,9 +7,9 @@
     "lib": [
       "esnext"
     ],
+    "isolatedModules": true,
     "target": "es2015",
     "module": "commonjs",
-    "isolatedModules": true,
     "declaration": true,
     "moduleResolution": "node",
     "noImplicitAny": true,
diff --git a/packages/imperative/__tests__/tsconfig.json b/packages/imperative/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/imperative/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/provisioning/__tests__/tsconfig.json b/packages/provisioning/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/provisioning/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/workflows/__tests__/tsconfig.json b/packages/workflows/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/workflows/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zosconsole/__tests__/tsconfig.json b/packages/zosconsole/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zosconsole/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zosfiles/__tests__/__system__/methods/hDelete/HDelete.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/hDelete/HDelete.system.test.ts
index 4e1596f66a..2579627594 100644
--- a/packages/zosfiles/__tests__/__system__/methods/hDelete/HDelete.system.test.ts
+++ b/packages/zosfiles/__tests__/__system__/methods/hDelete/HDelete.system.test.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { Create, Delete, CreateDataSetTypeEnum, HDelete, HMigrate, IDeleteOptions, ZosFilesMessages } from "../../../../src";
+import { Create, Delete, CreateDataSetTypeEnum, HDelete, HMigrate, IDeleteOptions, ZosFilesMessages } from "@zowe/zos-files-for-zowe-sdk";
 import { Imperative, Session } from "@zowe/imperative";
 import { inspect } from "util";
 import { ITestEnvironment } from "@zowe/cli-test-utils";
diff --git a/packages/zosfiles/__tests__/__system__/methods/hMigrate/HMigrate.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/hMigrate/HMigrate.system.test.ts
index 208dbd40e6..8091935be9 100644
--- a/packages/zosfiles/__tests__/__system__/methods/hMigrate/HMigrate.system.test.ts
+++ b/packages/zosfiles/__tests__/__system__/methods/hMigrate/HMigrate.system.test.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { Create, Delete, CreateDataSetTypeEnum, HMigrate, IListOptions, IMigrateOptions, List, ZosFilesMessages } from "../../../../src";
+import { Create, Delete, CreateDataSetTypeEnum, HMigrate, IListOptions, IMigrateOptions, List, ZosFilesMessages } from "@zowe/zos-files-for-zowe-sdk";
 import { Imperative, Session } from "@zowe/imperative";
 import { inspect } from "util";
 import { ITestEnvironment } from "@zowe/cli-test-utils";
diff --git a/packages/zosfiles/__tests__/__system__/methods/hRecall/HRecall.system.test.ts b/packages/zosfiles/__tests__/__system__/methods/hRecall/HRecall.system.test.ts
index 8e76a56ae3..f1d5bef6a5 100644
--- a/packages/zosfiles/__tests__/__system__/methods/hRecall/HRecall.system.test.ts
+++ b/packages/zosfiles/__tests__/__system__/methods/hRecall/HRecall.system.test.ts
@@ -9,7 +9,8 @@
 *
 */
 
-import { Create, Delete, CreateDataSetTypeEnum, HMigrate, HRecall, IListOptions, IRecallOptions, List, ZosFilesMessages } from "../../../../src";
+import { Create, Delete, CreateDataSetTypeEnum,
+    HMigrate, HRecall, IListOptions, IRecallOptions, List, ZosFilesMessages } from "@zowe/zos-files-for-zowe-sdk";
 import { Imperative, Session } from "@zowe/imperative";
 import { inspect } from "util";
 import { ITestEnvironment } from "@zowe/cli-test-utils";
diff --git a/packages/zosfiles/__tests__/tsconfig.json b/packages/zosfiles/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zosfiles/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zosjobs/__tests__/tsconfig.json b/packages/zosjobs/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zosjobs/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zoslogs/__tests__/tsconfig.json b/packages/zoslogs/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zoslogs/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zosmf/__tests__/tsconfig.json b/packages/zosmf/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zosmf/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zostso/__tests__/tsconfig.json b/packages/zostso/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zostso/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/zosuss/__tests__/tsconfig.json b/packages/zosuss/__tests__/tsconfig.json
new file mode 100644
index 0000000000..d4aef0749c
--- /dev/null
+++ b/packages/zosuss/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 454062485f..e49d36da8d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,7 +26,8 @@
     "**/__tests__/*",
     "**/*.spec.ts",
     "**/*-spec.ts",
-    "**/*.test.ts"
+    "**/*.test.ts",
+    "packages/imperative/__tests__"
   ],
   "files": [
     "./__types__/wontache.d.ts"