diff --git a/packages/app/src/cli/services/app/env/pull.test.ts b/packages/app/src/cli/services/app/env/pull.test.ts
index d75b724ffca..6bfdeacf921 100644
--- a/packages/app/src/cli/services/app/env/pull.test.ts
+++ b/packages/app/src/cli/services/app/env/pull.test.ts
@@ -1,15 +1,12 @@
 import {pullEnv} from './pull.js'
 import {AppInterface, AppLinkedInterface} from '../../../models/app/app.js'
 import {testApp, testOrganizationApp} from '../../../models/app/app.test-data.js'
-import {fetchAppFromConfigOrSelect} from '../fetch-app-from-config-or-select.js'
 import {OrganizationApp} from '../../../models/organization.js'
 import {describe, expect, vi, beforeEach, test} from 'vitest'
 import * as file from '@shopify/cli-kit/node/fs'
 import {resolvePath, joinPath} from '@shopify/cli-kit/node/path'
 import {unstyled, stringifyMessage} from '@shopify/cli-kit/node/output'
 
-vi.mock('../fetch-app-from-config-or-select')
-
 describe('env pull', () => {
   let app: AppLinkedInterface
   let remoteApp: OrganizationApp
@@ -17,7 +14,6 @@ describe('env pull', () => {
   beforeEach(async () => {
     app = mockApp() as AppLinkedInterface
     remoteApp = testOrganizationApp()
-    vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(testOrganizationApp())
   })
 
   test('creates a new environment file when there is no .env', async () => {
diff --git a/packages/app/src/cli/services/app/env/show.test.ts b/packages/app/src/cli/services/app/env/show.test.ts
index daf3e450866..cdc70093315 100644
--- a/packages/app/src/cli/services/app/env/show.test.ts
+++ b/packages/app/src/cli/services/app/env/show.test.ts
@@ -1,6 +1,5 @@
 import {showEnv} from './show.js'
 import {fetchOrganizations} from '../../dev/fetch.js'
-import {fetchAppFromConfigOrSelect} from '../fetch-app-from-config-or-select.js'
 import {AppInterface} from '../../../models/app/app.js'
 import {selectOrganizationPrompt} from '../../../prompts/dev.js'
 import {testApp, testOrganizationApp} from '../../../models/app/app.test-data.js'
@@ -10,7 +9,6 @@ import {stringifyMessage, unstyled} from '@shopify/cli-kit/node/output'
 import {joinPath} from '@shopify/cli-kit/node/path'
 
 vi.mock('../../dev/fetch.js')
-vi.mock('../fetch-app-from-config-or-select.js')
 vi.mock('../../../prompts/dev.js')
 vi.mock('@shopify/cli-kit/node/node-package-manager')
 
@@ -31,7 +29,6 @@ describe('env show', () => {
 
     vi.mocked(fetchOrganizations).mockResolvedValue([organization])
     vi.mocked(selectOrganizationPrompt).mockResolvedValue(organization)
-    vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(organizationApp)
 
     // When
     const result = await showEnv(app, remoteApp)
diff --git a/packages/app/src/cli/services/import-extensions.test.ts b/packages/app/src/cli/services/import-extensions.test.ts
index ebbd8177345..fd2d78645a5 100644
--- a/packages/app/src/cli/services/import-extensions.test.ts
+++ b/packages/app/src/cli/services/import-extensions.test.ts
@@ -1,8 +1,7 @@
 import {importExtensions} from './import-extensions.js'
-import {fetchAppAndIdentifiers} from './context.js'
 import {getExtensions} from './fetch-extensions.js'
 import {buildTomlObject} from './flow/extension-to-toml.js'
-import {testApp, testDeveloperPlatformClient} from '../models/app/app.test-data.js'
+import {testAppLinked, testDeveloperPlatformClient} from '../models/app/app.test-data.js'
 import {OrganizationApp} from '../models/organization.js'
 import {ExtensionRegistration} from '../api/graphql/all_app_extension_registrations.js'
 import {describe, expect, test, vi, beforeEach} from 'vitest'
@@ -63,16 +62,16 @@ describe('import-extensions', () => {
 
   test('importing an extension creates a folder and toml file', async () => {
     // Given
-    vi.mocked(fetchAppAndIdentifiers).mockResolvedValue([organizationApp, {}])
     vi.mocked(getExtensions).mockResolvedValue([flowExtensionA, flowExtensionB, marketingActivityExtension])
     vi.mocked(renderSelectPrompt).mockResolvedValue('uuidA')
 
     // When
     await inTemporaryDirectory(async (tmpDir) => {
-      const app = testApp({directory: tmpDir})
+      const app = testAppLinked({directory: tmpDir})
 
       await importExtensions({
         app,
+        remoteApp: organizationApp,
         developerPlatformClient: testDeveloperPlatformClient(),
         extensionTypes: ['flow_action_definition', 'flow_trigger_definition', 'marketing_activity_extension'],
         buildTomlObject,
@@ -97,16 +96,16 @@ describe('import-extensions', () => {
 
   test('selecting All imports all extensions', async () => {
     // Given
-    vi.mocked(fetchAppAndIdentifiers).mockResolvedValue([organizationApp, {}])
     vi.mocked(getExtensions).mockResolvedValue([flowExtensionA, flowExtensionB, marketingActivityExtension])
     vi.mocked(renderSelectPrompt).mockResolvedValue('All')
 
     // When
     await inTemporaryDirectory(async (tmpDir) => {
-      const app = testApp({directory: tmpDir})
+      const app = testAppLinked({directory: tmpDir})
 
       await importExtensions({
         app,
+        remoteApp: organizationApp,
         developerPlatformClient: testDeveloperPlatformClient(),
         extensionTypes: ['flow_action_definition', 'flow_trigger_definition', 'marketing_activity_extension'],
         buildTomlObject,
@@ -131,14 +130,14 @@ describe('import-extensions', () => {
 
   test('Show message if there are not extensions to migrate', async () => {
     // Given
-    vi.mocked(fetchAppAndIdentifiers).mockResolvedValue([organizationApp, {}])
     vi.mocked(getExtensions).mockResolvedValue([])
 
     // When
     await inTemporaryDirectory(async (tmpDir) => {
-      const app = testApp({directory: tmpDir})
+      const app = testAppLinked({directory: tmpDir})
       await importExtensions({
         app,
+        remoteApp: organizationApp,
         developerPlatformClient: testDeveloperPlatformClient(),
         extensionTypes: ['flow_action_definition', 'flow_trigger_definition', 'marketing_activity_extension'],
         buildTomlObject,
diff --git a/packages/app/src/cli/services/info.test.ts b/packages/app/src/cli/services/info.test.ts
index b7a879b56f1..ce2f958712e 100644
--- a/packages/app/src/cli/services/info.test.ts
+++ b/packages/app/src/cli/services/info.test.ts
@@ -1,5 +1,4 @@
 import {InfoOptions, info} from './info.js'
-import {fetchAppFromConfigOrSelect} from './app/fetch-app-from-config-or-select.js'
 import {AppInterface, AppLinkedInterface} from '../models/app/app.js'
 import {MinimalAppIdentifiers, OrganizationApp} from '../models/organization.js'
 import {selectOrganizationPrompt} from '../prompts/dev.js'
@@ -19,7 +18,6 @@ import {TokenizedString, stringifyMessage, unstyled} from '@shopify/cli-kit/node
 import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/node/fs'
 import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version'
 
-vi.mock('./app/fetch-app-from-config-or-select.js')
 vi.mock('../prompts/dev.js')
 vi.mock('@shopify/cli-kit/node/node-package-manager')
 vi.mock('../utilities/developer-platform-client.js')
@@ -115,7 +113,6 @@ describe('info', () => {
       const app = mockApp({directory: tmp})
 
       vi.mocked(selectOrganizationPrompt).mockResolvedValue(ORG1)
-      vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(APP)
 
       // When
       const result = await info(app, remoteApp, {...infoOptions(), webEnv: true})
@@ -136,7 +133,6 @@ describe('info', () => {
       // Given
       const app = mockApp({directory: tmp})
       vi.mocked(selectOrganizationPrompt).mockResolvedValue(ORG1)
-      vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(APP)
 
       // When
       const result = await info(app, remoteApp, {...infoOptions(), format: 'json', webEnv: true})
@@ -185,7 +181,6 @@ describe('info', () => {
         },
       })
       vi.mocked(selectOrganizationPrompt).mockResolvedValue(ORG1)
-      vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(APP1)
 
       // When
       const result = await info(app, remoteApp, infoOptions())
@@ -224,7 +219,6 @@ describe('info', () => {
         },
       })
       vi.mocked(selectOrganizationPrompt).mockResolvedValue(ORG1)
-      vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(APP1)
 
       // When
       const result = await info(app, remoteApp, infoOptions())
@@ -256,7 +250,6 @@ describe('info', () => {
         },
       })
       vi.mocked(selectOrganizationPrompt).mockResolvedValue(ORG1)
-      vi.mocked(fetchAppFromConfigOrSelect).mockResolvedValue(APP1)
 
       // When
       const result = await info(app, remoteApp, {format: 'json', webEnv: false, developerPlatformClient})
diff --git a/packages/app/src/cli/services/webhook/trigger-options.test.ts b/packages/app/src/cli/services/webhook/trigger-options.test.ts
index 742c043e770..3dcc2c25dcb 100644
--- a/packages/app/src/cli/services/webhook/trigger-options.test.ts
+++ b/packages/app/src/cli/services/webhook/trigger-options.test.ts
@@ -11,7 +11,6 @@ import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output'
 vi.mock('../../prompts/webhook/trigger.js')
 vi.mock('./request-api-versions.js')
 vi.mock('./request-topics.js')
-vi.mock('../app/fetch-app-from-config-or-select.js')
 
 const DELIVERY_METHOD = 'http'
 const SECRET = 'A_SECRET'
diff --git a/packages/app/src/cli/services/webhook/trigger.test.ts b/packages/app/src/cli/services/webhook/trigger.test.ts
index 7dd90a15fc2..26541d4559d 100644
--- a/packages/app/src/cli/services/webhook/trigger.test.ts
+++ b/packages/app/src/cli/services/webhook/trigger.test.ts
@@ -33,7 +33,6 @@ vi.mock('./request-api-versions.js')
 vi.mock('./request-topics.js')
 vi.mock('./trigger-local-webhook.js')
 vi.mock('./find-app-info.js')
-vi.mock('../app/fetch-app-from-config-or-select.js')
 vi.mock('../../models/app/loader.js')
 
 const emptyJson = '{}'