diff --git a/test/debugProvider.test.ts b/test/debugProvider.test.ts
index 28ba100a4..10bd30843 100644
--- a/test/debugProvider.test.ts
+++ b/test/debugProvider.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { DebugConfiguration, workspace } from 'vscode';
-import { StaticWebAppDebugProvider } from '../extension.bundle';
+import { StaticWebAppDebugProvider } from '../src/debug/StaticWebAppDebugProvider';
 import { getWorkspaceUri } from './testUtils';
 
 interface ITestCase {
diff --git a/test/global.test.ts b/test/global.test.ts
index 6dd79b966..63443e2b1 100644
--- a/test/global.test.ts
+++ b/test/global.test.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TestOutputChannel, TestUserInput } from '@microsoft/vscode-azext-dev';
+import { registerOnActionStartHandler, TestOutputChannel, TestUserInput } from '@microsoft/vscode-azext-utils';
 import * as assert from 'assert';
 import * as vscode from 'vscode';
-import { ext, registerOnActionStartHandler } from '../extension.bundle';
+import { ext } from '../src/extensionVariables';
 
 const longRunningLocalTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.AzCode_EnableLongRunningTestsLocal || '');
 const longRunningRemoteTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.AzCode_UseAzureFederatedCredentials || '');
diff --git a/test/nodeDetector.test.ts b/test/nodeDetector.test.ts
index 83c225096..fae687732 100644
--- a/test/nodeDetector.test.ts
+++ b/test/nodeDetector.test.ts
@@ -5,7 +5,8 @@
 
 import * as assert from 'assert';
 import { Uri } from "vscode";
-import { DetectorResults, NodeConstants, NodeDetector } from '../extension.bundle';
+import { NodeConstants } from '../src/detectors/node/nodeConstants';
+import { DetectorResults, NodeDetector } from '../src/detectors/node/NodeDetector';
 import { getWorkspaceUri } from './testUtils';
 
 interface ITestCase {
diff --git a/test/parseGitHubLog.test.ts b/test/parseGitHubLog.test.ts
index ba2c266dd..b5e25337c 100644
--- a/test/parseGitHubLog.test.ts
+++ b/test/parseGitHubLog.test.ts
@@ -5,7 +5,8 @@
 
 import * as assert from 'assert';
 import { FoldingRange } from 'vscode';
-import { createFoldingRanges, LogState, parseGitHubLog } from '../extension.bundle';
+import { createFoldingRanges } from '../src/commands/github/jobLogs/createFoldingRanges';
+import { LogState, parseGitHubLog } from '../src/commands/github/jobLogs/parseGitHubLog';
 
 suite('Parse response from GitHub downloadJobLogsForWorkflowRun API', () => {
     test('01 - Parse the entire job log', (() => {
diff --git a/test/selectBuildConfigs.test.ts b/test/selectBuildConfigs.test.ts
index 9c9dd9404..6ff7a7655 100644
--- a/test/selectBuildConfigs.test.ts
+++ b/test/selectBuildConfigs.test.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createTestActionContext } from '@microsoft/vscode-azext-dev';
+import { createTestActionContext } from '@microsoft/vscode-azext-utils';
 import * as assert from 'assert';
 import { Position, Range, TextDocument, TextDocumentContentProvider, Uri, workspace } from 'vscode';
-import { BuildConfig, tryGetSelection } from "../extension.bundle";
+import { tryGetSelection } from '../src/commands/openYAMLConfigFile';
+import { BuildConfig } from '../src/tree/WorkflowGroupTreeItem';
 
 interface ISelectBuildConfigTestCase {
     workflowIndex: number;
diff --git a/test/swaCliTaskProvider.test.ts b/test/swaCliTaskProvider.test.ts
index 25e21f05f..a24fded42 100644
--- a/test/swaCliTaskProvider.test.ts
+++ b/test/swaCliTaskProvider.test.ts
@@ -10,7 +10,7 @@
 
 import * as assert from 'assert';
 import { ShellExecution, Task, workspace } from 'vscode';
-import { SwaTaskProvider } from '../extension.bundle';
+import { SwaTaskProvider } from '../src/cli/SwaCliTaskProvider';
 import { getWorkspaceUri } from './testUtils';
 
 interface ITestCase {