diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8ebed38167..824b2fc0de 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1440,6 +1440,75 @@ importers:
         specifier: ^5.1.4
         version: 5.1.4(webpack@5.90.3)
 
+  test:
+    devDependencies:
+      '@payloadcms/db-mongodb':
+        specifier: workspace:*
+        version: link:../packages/db-mongodb
+      '@payloadcms/db-postgres':
+        specifier: workspace:*
+        version: link:../packages/db-postgres
+      '@payloadcms/eslint-config':
+        specifier: workspace:*
+        version: link:../packages/eslint-config-payload
+      '@payloadcms/graphql':
+        specifier: workspace:*
+        version: link:../packages/graphql
+      '@payloadcms/live-preview':
+        specifier: workspace:*
+        version: link:../packages/live-preview
+      '@payloadcms/live-preview-react':
+        specifier: workspace:*
+        version: link:../packages/live-preview-react
+      '@payloadcms/next':
+        specifier: workspace:*
+        version: link:../packages/next
+      '@payloadcms/plugin-cloud':
+        specifier: workspace:*
+        version: link:../packages/plugin-cloud
+      '@payloadcms/plugin-cloud-storage':
+        specifier: workspace:*
+        version: link:../packages/plugin-cloud-storage
+      '@payloadcms/plugin-form-builder':
+        specifier: workspace:*
+        version: link:../packages/plugin-form-builder
+      '@payloadcms/plugin-nested-docs':
+        specifier: workspace:*
+        version: link:../packages/plugin-nested-docs
+      '@payloadcms/plugin-redirects':
+        specifier: workspace:*
+        version: link:../packages/plugin-redirects
+      '@payloadcms/plugin-search':
+        specifier: workspace:*
+        version: link:../packages/plugin-search
+      '@payloadcms/plugin-sentry':
+        specifier: workspace:*
+        version: link:../packages/plugin-sentry
+      '@payloadcms/plugin-seo':
+        specifier: workspace:*
+        version: link:../packages/plugin-seo
+      '@payloadcms/plugin-stripe':
+        specifier: workspace:*
+        version: link:../packages/plugin-stripe
+      '@payloadcms/richtext-lexical':
+        specifier: workspace:*
+        version: link:../packages/richtext-lexical
+      '@payloadcms/richtext-slate':
+        specifier: workspace:*
+        version: link:../packages/richtext-slate
+      '@payloadcms/translations':
+        specifier: workspace:*
+        version: link:../packages/translations
+      '@payloadcms/ui':
+        specifier: workspace:*
+        version: link:../packages/ui
+      create-payload-app:
+        specifier: workspace:*
+        version: link:../packages/create-payload-app
+      payload:
+        specifier: workspace:*
+        version: link:../packages/payload
+
 packages:
 
   /@aashutoshrathi/word-wrap@1.2.6:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index b29c3ce752..285dddccdf 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,6 +1,6 @@
 packages:
   # all packages in direct subdirs of packages/
   - 'packages/*'
-  - 'test/REST_API'
+  - 'test'
   # exclude packages that are inside test directories
   # - '!**/test/**'
diff --git a/test/_community/collections/Media/index.ts b/test/_community/collections/Media/index.ts
index 5610002e22..3c523e01ef 100644
--- a/test/_community/collections/Media/index.ts
+++ b/test/_community/collections/Media/index.ts
@@ -1,4 +1,6 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+
+import { getPayload } from 'payload'
 
 export const mediaSlug = 'media'
 
diff --git a/test/_community/collections/Posts/index.ts b/test/_community/collections/Posts/index.ts
index e45245c25d..ac6689d001 100644
--- a/test/_community/collections/Posts/index.ts
+++ b/test/_community/collections/Posts/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { mediaSlug } from '../Media/index.js'
 
diff --git a/test/_community/globals/Menu/index.ts b/test/_community/globals/Menu/index.ts
index afdd01b4df..cd9ec96dea 100644
--- a/test/_community/globals/Menu/index.ts
+++ b/test/_community/globals/Menu/index.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 export const menuSlug = 'menu'
 
diff --git a/test/_community/int.spec.ts b/test/_community/int.spec.ts
index ae28bceb8b..3244effde5 100644
--- a/test/_community/int.spec.ts
+++ b/test/_community/int.spec.ts
@@ -1,4 +1,5 @@
-import type { Payload } from '../../packages/payload/types.js'
+import type { Payload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'
diff --git a/test/access-control/config.ts b/test/access-control/config.ts
index a621d0f0ac..04d9889d05 100644
--- a/test/access-control/config.ts
+++ b/test/access-control/config.ts
@@ -1,4 +1,4 @@
-import type { FieldAccess } from '../../packages/payload/src/fields/config/types.js'
+import type { FieldAccess } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
diff --git a/test/access-control/e2e.spec.ts b/test/access-control/e2e.spec.ts
index 8b0200bf24..62c2ec7460 100644
--- a/test/access-control/e2e.spec.ts
+++ b/test/access-control/e2e.spec.ts
@@ -1,10 +1,10 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload/types'
 
 import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/types/index.js'
 import type { ReadOnlyCollection, RestrictedVersion } from './payload-types.js'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
diff --git a/test/access-control/int.spec.ts b/test/access-control/int.spec.ts
index 27af91dc1d..a0587902f3 100644
--- a/test/access-control/int.spec.ts
+++ b/test/access-control/int.spec.ts
@@ -1,7 +1,9 @@
-import type { Payload, PayloadRequest } from '../../packages/payload/src/types/index.js'
+import type { Payload, PayloadRequest } from 'payload/types'
+
+import { Forbidden } from 'payload/errors'
+
 import type { Post, RelyOnRequestHeader, Restricted } from './payload-types.js'
 
-import { Forbidden } from '../../packages/payload/src/errors/index.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise, { requestHeaders } from './config.js'
 import {
diff --git a/test/admin/collections/CustomIdRow.ts b/test/admin/collections/CustomIdRow.ts
index fec1f247f3..93edcfe3e1 100644
--- a/test/admin/collections/CustomIdRow.ts
+++ b/test/admin/collections/CustomIdRow.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const CustomIdRow: CollectionConfig = {
   slug: 'customIdRow',
diff --git a/test/admin/collections/CustomIdTab.ts b/test/admin/collections/CustomIdTab.ts
index 902bfef813..9efdd772e5 100644
--- a/test/admin/collections/CustomIdTab.ts
+++ b/test/admin/collections/CustomIdTab.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const CustomIdTab: CollectionConfig = {
   slug: 'customIdTab',
diff --git a/test/admin/collections/CustomViews1.ts b/test/admin/collections/CustomViews1.ts
index 01b34adf74..c5a843337a 100644
--- a/test/admin/collections/CustomViews1.ts
+++ b/test/admin/collections/CustomViews1.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { CustomEditView } from '../components/views/CustomEdit/index.js'
 import { customViews1CollectionSlug } from '../slugs.js'
diff --git a/test/admin/collections/CustomViews2.ts b/test/admin/collections/CustomViews2.ts
index b470b98059..96e1e570e2 100644
--- a/test/admin/collections/CustomViews2.ts
+++ b/test/admin/collections/CustomViews2.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { CustomTabComponent } from '../components/CustomTabComponent/index.js'
 import { CustomTabView } from '../components/views/CustomTab/index.js'
diff --git a/test/admin/collections/Geo.ts b/test/admin/collections/Geo.ts
index 1470539e64..e0931eb596 100644
--- a/test/admin/collections/Geo.ts
+++ b/test/admin/collections/Geo.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { CollectionAPIButton } from '../components/CollectionAPIButton/index.js'
 import { CollectionEditButton } from '../components/CollectionEditButton/index.js'
diff --git a/test/admin/collections/Group1A.ts b/test/admin/collections/Group1A.ts
index c9fed46e6b..8c7f92e487 100644
--- a/test/admin/collections/Group1A.ts
+++ b/test/admin/collections/Group1A.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group1Collection1Slug } from '../slugs.js'
 
diff --git a/test/admin/collections/Group1B.ts b/test/admin/collections/Group1B.ts
index 880385f4ff..28cf6ac281 100644
--- a/test/admin/collections/Group1B.ts
+++ b/test/admin/collections/Group1B.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group1Collection2Slug } from '../slugs.js'
 
diff --git a/test/admin/collections/Group2A.ts b/test/admin/collections/Group2A.ts
index c7ab714d93..5753d70fd4 100644
--- a/test/admin/collections/Group2A.ts
+++ b/test/admin/collections/Group2A.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group2Collection1Slug } from '../slugs.js'
 
diff --git a/test/admin/collections/Group2B.ts b/test/admin/collections/Group2B.ts
index 1c2375db78..eca4079508 100644
--- a/test/admin/collections/Group2B.ts
+++ b/test/admin/collections/Group2B.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { group2Collection2Slug } from '../slugs.js'
 
diff --git a/test/admin/collections/Hidden.ts b/test/admin/collections/Hidden.ts
index 4960f342cf..a56bc1bfc4 100644
--- a/test/admin/collections/Hidden.ts
+++ b/test/admin/collections/Hidden.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { hiddenCollectionSlug } from '../slugs.js'
 
diff --git a/test/admin/collections/NoApiView.ts b/test/admin/collections/NoApiView.ts
index c956a64e00..025aad6813 100644
--- a/test/admin/collections/NoApiView.ts
+++ b/test/admin/collections/NoApiView.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { noApiViewCollectionSlug } from '../slugs.js'
 
diff --git a/test/admin/collections/Posts.ts b/test/admin/collections/Posts.ts
index 992c589192..ac992965bb 100644
--- a/test/admin/collections/Posts.ts
+++ b/test/admin/collections/Posts.ts
@@ -1,6 +1,7 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import { slateEditor } from '@payloadcms/richtext-slate'
+
+import type { CollectionConfig } from 'payload/types'
 
-import { slateEditor } from '../../../packages/richtext-slate/src/index.js'
 import { DemoUIFieldCell } from '../components/DemoUIField/Cell.js'
 import { DemoUIField } from '../components/DemoUIField/Field.js'
 import {
@@ -12,27 +13,19 @@ import { postsCollectionSlug } from '../slugs.js'
 
 export const Posts: CollectionConfig = {
   slug: postsCollectionSlug,
-  labels: {
-    singular: slugSingularLabel,
-    plural: slugPluralLabel,
-  },
   admin: {
-    description: 'Description',
-    listSearchableFields: ['id', 'title', 'description', 'number'],
-    group: 'One',
-    useAsTitle: 'title',
     defaultColumns: ['id', 'number', 'title', 'description', 'demoUIField'],
+    description: 'Description',
+    group: 'One',
+    listSearchableFields: ['id', 'title', 'description', 'number'],
     preview: () => 'https://payloadcms.com',
-  },
-  versions: {
-    drafts: true,
+    useAsTitle: 'title',
   },
   fields: [
     {
       type: 'tabs',
       tabs: [
         {
-          label: 'Tab 1',
           fields: [
             {
               name: 'title',
@@ -56,17 +49,18 @@ export const Posts: CollectionConfig = {
               }),
             },
             {
-              type: 'ui',
               name: 'demoUIField',
-              label: 'Demo UI Field',
+              type: 'ui',
               admin: {
                 components: {
-                  Field: DemoUIField,
                   Cell: DemoUIFieldCell,
+                  Field: DemoUIField,
                 },
               },
+              label: 'Demo UI Field',
             },
           ],
+          label: 'Tab 1',
         },
       ],
     },
@@ -83,22 +77,22 @@ export const Posts: CollectionConfig = {
     {
       name: 'relationship',
       type: 'relationship',
-      relationTo: 'posts',
       admin: {
         position: 'sidebar',
       },
+      relationTo: 'posts',
     },
     {
       name: 'sidebarField',
       type: 'text',
-      admin: {
-        position: 'sidebar',
-        description:
-          'This is a very long description that takes many characters to complete and hopefully will wrap instead of push the sidebar open, lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, voluptatum voluptates. Quisquam, voluptatum voluptates.',
-      },
       access: {
         update: () => false,
       },
+      admin: {
+        description:
+          'This is a very long description that takes many characters to complete and hopefully will wrap instead of push the sidebar open, lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, voluptatum voluptates. Quisquam, voluptatum voluptates.',
+        position: 'sidebar',
+      },
     },
     {
       name: 'descriptionAsString',
@@ -122,4 +116,11 @@ export const Posts: CollectionConfig = {
       },
     },
   ],
+  labels: {
+    plural: slugPluralLabel,
+    singular: slugSingularLabel,
+  },
+  versions: {
+    drafts: true,
+  },
 }
diff --git a/test/admin/collections/Users.ts b/test/admin/collections/Users.ts
index 2e0d71f3ec..2391d32a17 100644
--- a/test/admin/collections/Users.ts
+++ b/test/admin/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { usersCollectionSlug } from '../slugs.js'
 
diff --git a/test/admin/components/AfterNavLinks/index.tsx b/test/admin/components/AfterNavLinks/index.tsx
index 22ab3cabc4..ee476edca2 100644
--- a/test/admin/components/AfterNavLinks/index.tsx
+++ b/test/admin/components/AfterNavLinks/index.tsx
@@ -1,12 +1,14 @@
 'use client'
 
+import { useConfig } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
 import React from 'react'
 
 // As this is the demo project, we import our dependencies from the `src` directory.
-import { useConfig } from '../../../../packages/ui/src/providers/Config/index.js'
+// import { useConfig } from '@payloadcms/ui'
+// import { useConfig } from '@payloadcms/ui'
 
 // In your projects, you can import as follows:
 // import { useConfig } from 'payload/components/utilities';
diff --git a/test/admin/components/BeforeLogin/index.tsx b/test/admin/components/BeforeLogin/index.tsx
index 6db239d1b1..76ffd609a8 100644
--- a/test/admin/components/BeforeLogin/index.tsx
+++ b/test/admin/components/BeforeLogin/index.tsx
@@ -2,7 +2,7 @@
 
 import React from 'react'
 
-import { useTranslation } from '../../../../packages/ui/src/providers/Translation/index.js'
+import { useTranslation } from '@payloadcms/ui'
 
 export const BeforeLogin: React.FC = () => {
   const translation = useTranslation()
diff --git a/test/admin/components/CustomTabComponent/index.tsx b/test/admin/components/CustomTabComponent/index.tsx
index 6eb570a44e..a4eac58555 100644
--- a/test/admin/components/CustomTabComponent/index.tsx
+++ b/test/admin/components/CustomTabComponent/index.tsx
@@ -1,10 +1,10 @@
 'use client'
 
+import type { DocumentTabComponent } from 'payload/types'
+
 import React from 'react'
 import { Link, useRouteMatch } from 'react-router-dom'
 
-import type { DocumentTabComponent } from '../../../../packages/payload/src/admin/types.js'
-
 import './index.scss'
 
 export const CustomTabComponent: DocumentTabComponent = (props) => {
diff --git a/test/admin/components/FieldDescription/index.tsx b/test/admin/components/FieldDescription/index.tsx
index 5c132233e1..0f4c57fb15 100644
--- a/test/admin/components/FieldDescription/index.tsx
+++ b/test/admin/components/FieldDescription/index.tsx
@@ -1,9 +1,6 @@
-import React from 'react'
+import type { DescriptionComponent, DescriptionFunction } from 'payload/types'
 
-import type {
-  DescriptionComponent,
-  DescriptionFunction,
-} from '../../../../packages/payload/src/admin/types.js'
+import React from 'react'
 
 export const FieldDescriptionComponent: DescriptionComponent<string> = ({ path, value }) => {
   return (
diff --git a/test/admin/components/Logout/index.tsx b/test/admin/components/Logout/index.tsx
index 76120ee637..ca3b99ff24 100644
--- a/test/admin/components/Logout/index.tsx
+++ b/test/admin/components/Logout/index.tsx
@@ -2,8 +2,8 @@
 
 import React from 'react'
 
-import { LogOut } from '../../../../packages/ui/src/icons/LogOut/index.js'
-import { useConfig } from '../../../../packages/ui/src/providers/Config/index.js'
+import { LogOut } from '@payloadcms/ui'
+import { useConfig } from '@payloadcms/ui'
 
 export const Logout: React.FC = () => {
   const config = useConfig()
diff --git a/test/admin/components/views/CustomAccount/index.tsx b/test/admin/components/views/CustomAccount/index.tsx
index 05eba5832c..d917a65f01 100644
--- a/test/admin/components/views/CustomAccount/index.tsx
+++ b/test/admin/components/views/CustomAccount/index.tsx
@@ -1,6 +1,6 @@
-import React, { Fragment } from 'react'
+import type { AdminViewComponent } from 'payload/types'
 
-import type { AdminViewComponent } from '../../../../../packages/payload/src/admin/types.js'
+import React, { Fragment } from 'react'
 
 export const CustomAccountView: AdminViewComponent = () => {
   return (
diff --git a/test/admin/components/views/CustomDashboard/index.tsx b/test/admin/components/views/CustomDashboard/index.tsx
index 9a92f391ec..75e6dc757c 100644
--- a/test/admin/components/views/CustomDashboard/index.tsx
+++ b/test/admin/components/views/CustomDashboard/index.tsx
@@ -1,6 +1,6 @@
-import React, { Fragment } from 'react'
+import type { AdminViewComponent } from 'payload/types'
 
-import type { AdminViewComponent } from '../../../../../packages/payload/src/admin/types.js'
+import React, { Fragment } from 'react'
 
 export const CustomDashboardView: AdminViewComponent = () => {
   return (
diff --git a/test/admin/components/views/CustomDefault/index.tsx b/test/admin/components/views/CustomDefault/index.tsx
index 1c7c80791a..c12c914b75 100644
--- a/test/admin/components/views/CustomDefault/index.tsx
+++ b/test/admin/components/views/CustomDefault/index.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 
 import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
-import { Button, DefaultTemplate, SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { Button, DefaultTemplate, SetStepNav } from '@payloadcms/ui'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
diff --git a/test/admin/components/views/CustomEdit/index.tsx b/test/admin/components/views/CustomEdit/index.tsx
index 558ba1e770..697d9a8a47 100644
--- a/test/admin/components/views/CustomEdit/index.tsx
+++ b/test/admin/components/views/CustomEdit/index.tsx
@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { EditViewComponent } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 
 export const CustomEditView: EditViewComponent = ({ initPageResult }) => {
   if (!initPageResult) {
diff --git a/test/admin/components/views/CustomEditDefault/index.tsx b/test/admin/components/views/CustomEditDefault/index.tsx
index 91d6b4b73c..6dc44cec3f 100644
--- a/test/admin/components/views/CustomEditDefault/index.tsx
+++ b/test/admin/components/views/CustomEditDefault/index.tsx
@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { EditViewComponent } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 
 export const CustomDefaultEditView: EditViewComponent = ({ initPageResult }) => {
   if (!initPageResult) {
diff --git a/test/admin/components/views/CustomMinimal/index.tsx b/test/admin/components/views/CustomMinimal/index.tsx
index a13124cf55..d989b83b47 100644
--- a/test/admin/components/views/CustomMinimal/index.tsx
+++ b/test/admin/components/views/CustomMinimal/index.tsx
@@ -1,9 +1,9 @@
 import LinkImport from 'next/link.js'
 import React from 'react'
 
-import { Button } from '../../../../../packages/ui/src/elements/Button/index.js'
+import { Button } from '@payloadcms/ui'
 // As this is the demo project, we import our dependencies from the `src` directory.
-import { MinimalTemplate } from '../../../../../packages/ui/src/templates/Minimal/index.js'
+import { MinimalTemplate } from '@payloadcms/ui'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
diff --git a/test/admin/components/views/CustomTab/index.tsx b/test/admin/components/views/CustomTab/index.tsx
index 06c7990a46..7033fc5b16 100644
--- a/test/admin/components/views/CustomTab/index.tsx
+++ b/test/admin/components/views/CustomTab/index.tsx
@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 import { customTabViewTitle } from '../../../shared.js'
 
 export const CustomTabView: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {
diff --git a/test/admin/components/views/CustomTab2/index.tsx b/test/admin/components/views/CustomTab2/index.tsx
index 465b5fe885..f622c34fef 100644
--- a/test/admin/components/views/CustomTab2/index.tsx
+++ b/test/admin/components/views/CustomTab2/index.tsx
@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 import { customTabViewTitle } from '../../../shared.js'
 
 export const CustomTabView2: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {
diff --git a/test/admin/components/views/CustomTabNested/index.tsx b/test/admin/components/views/CustomTabNested/index.tsx
index 72c5437b73..8ad5a1fb43 100644
--- a/test/admin/components/views/CustomTabNested/index.tsx
+++ b/test/admin/components/views/CustomTabNested/index.tsx
@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { ServerSideEditViewProps } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 import { customNestedTabViewTitle } from '../../../shared.js'
 
 export const CustomNestedTabView: React.FC<ServerSideEditViewProps> = ({ initPageResult }) => {
diff --git a/test/admin/components/views/CustomVersions/index.tsx b/test/admin/components/views/CustomVersions/index.tsx
index a41bad2f48..a48ded7660 100644
--- a/test/admin/components/views/CustomVersions/index.tsx
+++ b/test/admin/components/views/CustomVersions/index.tsx
@@ -3,7 +3,7 @@ import React, { Fragment } from 'react'
 
 import type { EditViewComponent } from '../../../../../packages/payload/types.js'
 
-import { SetStepNav } from '../../../../../packages/ui/src/index.js'
+import { SetStepNav } from '@payloadcms/ui'
 
 export const CustomVersionsView: EditViewComponent = ({ initPageResult }) => {
   if (!initPageResult) {
diff --git a/test/admin/components/views/CustomView/index.tsx b/test/admin/components/views/CustomView/index.tsx
index 5b1e752d36..0eeb1915c1 100644
--- a/test/admin/components/views/CustomView/index.tsx
+++ b/test/admin/components/views/CustomView/index.tsx
@@ -1,4 +1,4 @@
-// import { Button } from '../../../../../packages/ui/src/index.js'
+// import { Button } from '@payloadcms/ui'
 import LinkImport from 'next/link.js'
 import React from 'react'
 
@@ -6,7 +6,7 @@ import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
-import { Button } from '../../../../../packages/ui/src/elements/Button/index.js'
+import { Button } from '@payloadcms/ui'
 import { customNestedViewPath, customViewTitle } from '../../../shared.js'
 
 export const CustomView: React.FC<AdminViewProps> = ({ initPageResult }) => {
diff --git a/test/admin/components/views/CustomViewNested/index.tsx b/test/admin/components/views/CustomViewNested/index.tsx
index 968942afb3..4943b79096 100644
--- a/test/admin/components/views/CustomViewNested/index.tsx
+++ b/test/admin/components/views/CustomViewNested/index.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 
 import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
-import { Button } from '../../../../../packages/ui/src/index.js'
+import { Button } from '@payloadcms/ui'
 import { customNestedViewTitle, customViewPath } from '../../../shared.js'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
diff --git a/test/admin/components/views/CustomViewWithParam/index.tsx b/test/admin/components/views/CustomViewWithParam/index.tsx
index 33e396fac0..15aa721f39 100644
--- a/test/admin/components/views/CustomViewWithParam/index.tsx
+++ b/test/admin/components/views/CustomViewWithParam/index.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 
 import type { AdminViewProps } from '../../../../../packages/payload/types.js'
 
-import { Button } from '../../../../../packages/ui/src/elements/Button/index.js'
+import { Button } from '@payloadcms/ui'
 
 const Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default
 
diff --git a/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
index 13c9eb4138..9478e5cbae 100644
--- a/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -1,9 +1,9 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload'
 
 import { expect, test } from '@playwright/test'
 import qs from 'qs'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { Geo, Post } from './payload-types.js'
 
 import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
@@ -872,8 +872,8 @@ describe('admin', () => {
         const whereQueryJSON = {
           point: {
             within: {
-              coordinates: [polygon],
               type: 'Polygon',
+              coordinates: [polygon],
             },
           },
         }
@@ -1299,8 +1299,8 @@ async function deleteAllPosts() {
   await Promise.all([
     ...posts.docs.map((post) => {
       return payload.delete({
-        collection: postsCollectionSlug,
         id: post.id,
+        collection: postsCollectionSlug,
       })
     }),
   ])
diff --git a/test/admin/globals/CustomViews1.ts b/test/admin/globals/CustomViews1.ts
index 33490bc7fe..2505b4e225 100644
--- a/test/admin/globals/CustomViews1.ts
+++ b/test/admin/globals/CustomViews1.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { CustomEditView } from '../components/views/CustomEdit/index.js'
 import { customGlobalViews1GlobalSlug } from '../slugs.js'
diff --git a/test/admin/globals/CustomViews2.ts b/test/admin/globals/CustomViews2.ts
index d2ea375be1..373dc7b4e3 100644
--- a/test/admin/globals/CustomViews2.ts
+++ b/test/admin/globals/CustomViews2.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { CustomTabComponent } from '../components/CustomTabComponent/index.js'
 import { CustomDefaultEditView } from '../components/views/CustomEditDefault/index.js'
diff --git a/test/admin/globals/Global.ts b/test/admin/globals/Global.ts
index ff04379044..204127e933 100644
--- a/test/admin/globals/Global.ts
+++ b/test/admin/globals/Global.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { GlobalAPIButton } from '../components/GlobalAPIButton/index.js'
 import { GlobalEditButton } from '../components/GlobalEditButton/index.js'
diff --git a/test/admin/globals/Group1A.ts b/test/admin/globals/Group1A.ts
index 9a96ff0794..47d2df4008 100644
--- a/test/admin/globals/Group1A.ts
+++ b/test/admin/globals/Group1A.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { group1GlobalSlug } from '../slugs.js'
 
diff --git a/test/admin/globals/Group1B.ts b/test/admin/globals/Group1B.ts
index 1cb4c7f96a..19b5049698 100644
--- a/test/admin/globals/Group1B.ts
+++ b/test/admin/globals/Group1B.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { group2GlobalSlug } from '../slugs.js'
 
diff --git a/test/admin/globals/Hidden.ts b/test/admin/globals/Hidden.ts
index fde11bf271..2a150ff74b 100644
--- a/test/admin/globals/Hidden.ts
+++ b/test/admin/globals/Hidden.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { hiddenGlobalSlug } from '../slugs.js'
 
diff --git a/test/admin/globals/NoApiView.ts b/test/admin/globals/NoApiView.ts
index aaaad8bea5..6ed6d3b0c0 100644
--- a/test/admin/globals/NoApiView.ts
+++ b/test/admin/globals/NoApiView.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { noApiViewGlobalSlug } from '../slugs.js'
 
diff --git a/test/admin/seed.ts b/test/admin/seed.ts
index 66a99f5010..f6fdb2fa39 100644
--- a/test/admin/seed.ts
+++ b/test/admin/seed.ts
@@ -1,11 +1,10 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { devUser } from '../credentials.js'
 import { seedDB } from '../helpers/seed.js'
 import {
   collectionSlugs,
   customIdCollectionId,
-  customIdCollectionSlug,
   customViews1CollectionSlug,
   customViews2CollectionSlug,
   geoCollectionSlug,
@@ -30,7 +29,7 @@ export async function clearAndSeedEverything(_payload: Payload) {
           },
         }),
         ...[...Array(11)].map(() => {
-          _payload.create({
+          void _payload.create({
             collection: postsCollectionSlug,
             data: {
               title: 'Title',
diff --git a/test/array-update/int.spec.ts b/test/array-update/int.spec.ts
index 3c3a1dc67c..d3d4f3ffa3 100644
--- a/test/array-update/int.spec.ts
+++ b/test/array-update/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
diff --git a/test/auth/AuthDebug.tsx b/test/auth/AuthDebug.tsx
index 8a6de5096f..32e018abf2 100644
--- a/test/auth/AuthDebug.tsx
+++ b/test/auth/AuthDebug.tsx
@@ -1,12 +1,11 @@
 'use client'
 
+import type { User } from 'payload/auth'
+import type { UIField } from 'payload/types'
+
+import { useAuth } from '@payloadcms/ui'
 import React, { useEffect, useState } from 'react'
 
-import type { User } from '../../packages/payload/src/auth/types.js'
-import type { UIField } from '../../packages/payload/src/fields/config/types.js'
-
-import { useAuth } from '../../packages/ui/src/providers/Auth/index.js'
-
 export const AuthDebug: React.FC<UIField> = () => {
   const [state, setState] = useState<User | null | undefined>()
   const { user } = useAuth()
diff --git a/test/auth/custom-strategy/int.spec.ts b/test/auth/custom-strategy/int.spec.ts
index 2322d5e6f3..bf7b9b9e85 100644
--- a/test/auth/custom-strategy/int.spec.ts
+++ b/test/auth/custom-strategy/int.spec.ts
@@ -1,6 +1,6 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
-import { getPayload } from '../../../packages/payload/src/index.js'
+import { getPayload } from 'payload'
 import { NextRESTClient } from '../../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../../startMemoryDB.js'
 import configPromise from './config.js'
diff --git a/test/auth/e2e.spec.ts b/test/auth/e2e.spec.ts
index 0ea9530789..c7a86d185f 100644
--- a/test/auth/e2e.spec.ts
+++ b/test/auth/e2e.spec.ts
@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPageConsoleErrorCatch, login, saveDocAndAssert } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
diff --git a/test/auth/int.spec.ts b/test/auth/int.spec.ts
index b125ea1609..2b28a2d78f 100644
--- a/test/auth/int.spec.ts
+++ b/test/auth/int.spec.ts
@@ -1,7 +1,8 @@
+import type { Payload } from 'payload'
+import type { User } from 'payload/auth'
+
 import jwtDecode from 'jwt-decode'
 
-import type { User } from '../../packages/payload/src/auth/index.js'
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'
diff --git a/test/auth/removed-token/int.spec.ts b/test/auth/removed-token/int.spec.ts
index 7b3becbff7..4ed86fca06 100644
--- a/test/auth/removed-token/int.spec.ts
+++ b/test/auth/removed-token/int.spec.ts
@@ -1,6 +1,6 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
-import { getPayload } from '../../../packages/payload/src/index.js'
+import { getPayload } from 'payload'
 import { devUser } from '../../credentials.js'
 import { NextRESTClient } from '../../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../../startMemoryDB.js'
diff --git a/test/auth/ui/AuthDebug.tsx b/test/auth/ui/AuthDebug.tsx
index d6035a4684..65db93769a 100644
--- a/test/auth/ui/AuthDebug.tsx
+++ b/test/auth/ui/AuthDebug.tsx
@@ -1,17 +1,16 @@
+import type { User } from 'payload/auth'
+import type { UIField } from 'payload/types'
+
+import { useAuth } from '@payloadcms/ui'
 import React, { useEffect, useState } from 'react'
 
-import type { User } from '../../../packages/payload/src/auth/index.js'
-import type { UIField } from '../../../packages/payload/src/fields/config/types.js'
-
-import { useAuth } from '../../../packages/ui/src/providers/Auth/index.js'
-
 export const AuthDebug: React.FC<UIField> = () => {
   const [state, setState] = useState<User | null | undefined>()
   const { user } = useAuth()
 
   useEffect(() => {
     if (user) {
-      fetch(`/api/users/${user.id}`)
+      void fetch(`/api/users/${user.id}`)
         .then((r) => r.json())
         .then((newUser) => {
           setState(newUser)
diff --git a/test/buildConfigWithDefaults.ts b/test/buildConfigWithDefaults.ts
index def09eece3..cf12ad42ef 100644
--- a/test/buildConfigWithDefaults.ts
+++ b/test/buildConfigWithDefaults.ts
@@ -1,10 +1,7 @@
-import sharp from 'sharp'
+import type { SanitizedConfig } from 'payload/types'
 
-import type { Config, SanitizedConfig } from '../packages/payload/src/config/types.js'
-
-import { mongooseAdapter } from '../packages/db-mongodb/src/index.js'
-import { postgresAdapter } from '../packages/db-postgres/src/index.js'
-import { buildConfig as buildPayloadConfig } from '../packages/payload/src/config/build.js'
+import { mongooseAdapter } from '@payloadcms/db-mongodb'
+import { postgresAdapter } from '@payloadcms/db-postgres'
 import {
   AlignFeature,
   BlockQuoteFeature,
@@ -27,8 +24,10 @@ import {
   UnorderedListFeature,
   UploadFeature,
   lexicalEditor,
-} from '../packages/richtext-lexical/src/index.js'
-// import { slateEditor } from '../packages/richtext-slate/src/index.js'
+} from '@payloadcms/richtext-lexical'
+import { slateEditor } from '@payloadcms/richtext-slate'
+import { type Config, buildConfig } from 'payload/config'
+import sharp from 'sharp'
 // process.env.PAYLOAD_DATABASE = 'postgres'
 
 const databaseAdapters = {
@@ -184,5 +183,5 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
     config.admin.disable = true
   }
 
-  return buildPayloadConfig(config)
+  return buildConfig(config)
 }
diff --git a/test/collections-graphql/config.ts b/test/collections-graphql/config.ts
index 7075ec2607..8534f3758e 100644
--- a/test/collections-graphql/config.ts
+++ b/test/collections-graphql/config.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
diff --git a/test/collections-graphql/int.spec.ts b/test/collections-graphql/int.spec.ts
index 2e3c7cf893..6a9f2e5528 100644
--- a/test/collections-graphql/int.spec.ts
+++ b/test/collections-graphql/int.spec.ts
@@ -1,7 +1,7 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { Post } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
+import { getPayload } from 'payload'
 import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { NextRESTClient } from '../helpers/NextRESTClient.js'
 import { idToString } from '../helpers/idToString.js'
diff --git a/test/collections-rest/config.ts b/test/collections-rest/config.ts
index c92c20d958..050f8a096e 100644
--- a/test/collections-rest/config.ts
+++ b/test/collections-rest/config.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
diff --git a/test/collections-rest/int.spec.ts b/test/collections-rest/int.spec.ts
index 7eec0b2d72..41cdb3577f 100644
--- a/test/collections-rest/int.spec.ts
+++ b/test/collections-rest/int.spec.ts
@@ -1,10 +1,11 @@
-import { randomBytes } from 'crypto'
+import type { Payload } from 'payload'
+
+import { randomBytes } from 'crypto'
+import { getPayload } from 'payload'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { Relation } from './config.js'
 import type { Post } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
 import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { NextRESTClient } from '../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../startMemoryDB.js'
@@ -1021,6 +1022,7 @@ describe('collections-rest', () => {
 
           it('should sort find results by nearest distance', async () => {
             // creating twice as many records as we are querying to get a random sample
+            // eslint-disable-next-line @typescript-eslint/require-await
             await mapAsync([...Array(10)], async () => {
               // setTimeout used to randomize the creation timestamp
               setTimeout(async () => {
diff --git a/test/config/int.spec.ts b/test/config/int.spec.ts
index 9a16191729..49dc8ae445 100644
--- a/test/config/int.spec.ts
+++ b/test/config/int.spec.ts
@@ -1,5 +1,5 @@
-import type { BlockField } from '../../packages/payload/src/fields/config/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+import type { BlockField } from 'payload/types'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
diff --git a/test/custom-graphql/config.ts b/test/custom-graphql/config.ts
index 8beef34d52..48f2538d2f 100644
--- a/test/custom-graphql/config.ts
+++ b/test/custom-graphql/config.ts
@@ -1,6 +1,5 @@
-import { commitTransaction } from '../../packages/payload/src/utilities/commitTransaction.js'
-import { initTransaction } from '../../packages/payload/src/utilities/initTransaction.js'
-import { killTransaction } from '../../packages/payload/src/utilities/killTransaction.js'
+import { commitTransaction, initTransaction, killTransaction } from 'payload/database'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 
diff --git a/test/custom-graphql/int.spec.ts b/test/custom-graphql/int.spec.ts
index eb2df15436..758a5e219b 100644
--- a/test/custom-graphql/int.spec.ts
+++ b/test/custom-graphql/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/database/int.spec.ts b/test/database/int.spec.ts
index 1a4b7a9a34..dc0a092992 100644
--- a/test/database/int.spec.ts
+++ b/test/database/int.spec.ts
@@ -1,15 +1,13 @@
+import type { PostgresAdapter } from '@payloadcms/db-postgres/types'
+import type { Payload } from 'payload'
+import type { PayloadRequest, TypeWithID } from 'payload/types'
+
 import { sql } from 'drizzle-orm'
 import fs from 'fs'
 import path from 'path'
+import { commitTransaction, initTransaction } from 'payload/database'
 import { fileURLToPath } from 'url'
 
-import type { PostgresAdapter } from '../../packages/db-postgres/src/types.js'
-import type { TypeWithID } from '../../packages/payload/src/collections/config/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
-import type { PayloadRequest } from '../../packages/payload/src/types/index.js'
-
-import { commitTransaction } from '../../packages/payload/src/utilities/commitTransaction.js'
-import { initTransaction } from '../../packages/payload/src/utilities/initTransaction.js'
 import { devUser } from '../credentials.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import removeFiles from '../helpers/removeFiles.js'
diff --git a/test/dataloader/config.ts b/test/dataloader/config.ts
index 5ebf49e035..be3424a432 100644
--- a/test/dataloader/config.ts
+++ b/test/dataloader/config.ts
@@ -1,4 +1,5 @@
-import { slateEditor } from '../../packages/richtext-slate/src/index.js'
+import { slateEditor } from '@payloadcms/richtext-slate'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 
diff --git a/test/dataloader/int.spec.ts b/test/dataloader/int.spec.ts
index c3259b7d1e..c86dddd8d5 100644
--- a/test/dataloader/int.spec.ts
+++ b/test/dataloader/int.spec.ts
@@ -1,4 +1,5 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'
@@ -92,8 +93,8 @@ describe('dataloader', () => {
       expect(relationB.id).toBeDefined()
 
       await payload.update({
-        collection: 'relation-a',
         id: relationA.id,
+        collection: 'relation-a',
         data: {
           relationship: relationB.id,
           richText: [
@@ -105,32 +106,32 @@ describe('dataloader', () => {
               ],
             },
             {
+              type: 'relationship',
               children: [
                 {
                   text: '',
                 },
               ],
-              type: 'relationship',
+              relationTo: 'relation-b',
               value: {
                 id: relationB.id,
               },
-              relationTo: 'relation-b',
             },
           ],
         },
       })
 
       const relationANoDepth = await payload.findByID({
-        collection: 'relation-a',
         id: relationA.id,
+        collection: 'relation-a',
         depth: 0,
       })
 
       expect(relationANoDepth.relationship).toStrictEqual(relationB.id)
 
       const relationAWithDepth = await payload.findByID({
-        collection: 'relation-a',
         id: relationA.id,
+        collection: 'relation-a',
         depth: 4,
       })
 
diff --git a/test/endpoints/endpoints/collections.ts b/test/endpoints/endpoints/collections.ts
index 16b858b4ee..4a09a2b408 100644
--- a/test/endpoints/endpoints/collections.ts
+++ b/test/endpoints/endpoints/collections.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const collectionEndpoints: CollectionConfig['endpoints'] = [
   {
diff --git a/test/endpoints/endpoints/globals.ts b/test/endpoints/endpoints/globals.ts
index d51668f163..345eab9a74 100644
--- a/test/endpoints/endpoints/globals.ts
+++ b/test/endpoints/endpoints/globals.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { globalEndpoint } from '../shared.js'
 
diff --git a/test/endpoints/endpoints/root.ts b/test/endpoints/endpoints/root.ts
index f268fc729a..76b8da6245 100644
--- a/test/endpoints/endpoints/root.ts
+++ b/test/endpoints/endpoints/root.ts
@@ -1,4 +1,4 @@
-import type { Config } from '../../../packages/payload/src/config/types.js'
+import type { Config } from 'payload/config'
 
 import { applicationEndpoint, rootEndpoint } from '../shared.js'
 
diff --git a/test/endpoints/int.spec.ts b/test/endpoints/int.spec.ts
index 444ac95325..2f65bcad0b 100644
--- a/test/endpoints/int.spec.ts
+++ b/test/endpoints/int.spec.ts
@@ -1,6 +1,6 @@
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
-import { type Payload } from '../../packages/payload/src/index.js'
+import { type Payload } from 'payload'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
 import {
diff --git a/test/field-error-states/collections/ErrorFields/index.ts b/test/field-error-states/collections/ErrorFields/index.ts
index a44d029b35..4bbd1d1524 100644
--- a/test/field-error-states/collections/ErrorFields/index.ts
+++ b/test/field-error-states/collections/ErrorFields/index.ts
@@ -1,5 +1,5 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
-import type { Field } from '../../../../packages/payload/src/fields/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+import type { Field } from 'payload/types'
 
 export const errorFieldsSlug = 'error-fields'
 
diff --git a/test/field-error-states/collections/Upload/index.ts b/test/field-error-states/collections/Upload/index.ts
index 1903c46e23..03a73093cb 100644
--- a/test/field-error-states/collections/Upload/index.ts
+++ b/test/field-error-states/collections/Upload/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 const Uploads: CollectionConfig = {
   slug: 'uploads',
diff --git a/test/fields-relationship/PrePopulateFieldUI/index.tsx b/test/fields-relationship/PrePopulateFieldUI/index.tsx
index ea80ecc9dd..0232b27cad 100644
--- a/test/fields-relationship/PrePopulateFieldUI/index.tsx
+++ b/test/fields-relationship/PrePopulateFieldUI/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { useField } from '../../../packages/ui/src/forms/useField/index.js'
+import { useField } from '@payloadcms/ui'
 import { collection1Slug } from '../collectionSlugs.js'
 
 export const PrePopulateFieldUI: React.FC<{
diff --git a/test/fields-relationship/config.ts b/test/fields-relationship/config.ts
index cbe68db796..cd039e4b71 100644
--- a/test/fields-relationship/config.ts
+++ b/test/fields-relationship/config.ts
@@ -1,5 +1,5 @@
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
-import type { FilterOptionsProps } from '../../packages/payload/src/fields/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+import type { FilterOptionsProps } from 'payload/types'
 
 import { mapAsync } from '../../packages/payload/src/utilities/mapAsync.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
@@ -105,7 +105,7 @@ export default buildConfigWithDefaults({
         },
         {
           name: 'relationshipFilteredAsync',
-          filterOptions: async (args: FilterOptionsProps<FieldsRelationship>) => {
+          filterOptions: (args: FilterOptionsProps<FieldsRelationship>) => {
             return {
               id: {
                 equals: args.data.relationship,
@@ -410,13 +410,13 @@ export default buildConfigWithDefaults({
       })
     })
     ;[...Array(15)].forEach((_, i) => {
-      payload.create({
+      void payload.create({
         collection: collection1Slug,
         data: {
           name: `relationship-test ${i}`,
         },
       })
-      payload.create({
+      void payload.create({
         collection: collection2Slug,
         data: {
           name: `relationship-test ${i}`,
diff --git a/test/fields-relationship/e2e.spec.ts b/test/fields-relationship/e2e.spec.ts
index e90db58a32..2b5d214ec8 100644
--- a/test/fields-relationship/e2e.spec.ts
+++ b/test/fields-relationship/e2e.spec.ts
@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type {
   FieldsRelationship as CollectionWithRelationships,
   RelationOne,
diff --git a/test/fields/collections/Array/LabelComponent.tsx b/test/fields/collections/Array/LabelComponent.tsx
index 285a3286df..234716d05e 100644
--- a/test/fields/collections/Array/LabelComponent.tsx
+++ b/test/fields/collections/Array/LabelComponent.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import type { RowLabelComponent } from 'payload/types'
 
-import type { RowLabelComponent } from '../../../../packages/payload/src/admin/forms/RowLabel.js'
+import React from 'react'
 
 export const ArrayRowLabel: RowLabelComponent = ({ data }) => {
   return (
diff --git a/test/fields/collections/Array/index.ts b/test/fields/collections/Array/index.ts
index 6480153f6a..9e3d6cdace 100644
--- a/test/fields/collections/Array/index.ts
+++ b/test/fields/collections/Array/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { arrayFieldsSlug } from '../../slugs.js'
 import { ArrayRowLabel } from './LabelComponent.js'
diff --git a/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx b/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx
index 2c19dda2f6..df6cff9199 100644
--- a/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx
+++ b/test/fields/collections/Blocks/components/AddCustomBlocks/index.tsx
@@ -1,8 +1,8 @@
 'use client'
 import * as React from 'react'
 
-import { useForm } from '../../../../../../packages/ui/src/forms/Form/context.js'
-import { useField } from '../../../../../../packages/ui/src/forms/useField/index.js'
+import { useForm } from '@payloadcms/ui'
+import { useField } from '@payloadcms/ui'
 import './index.scss'
 
 const baseClass = 'custom-blocks-field-management'
diff --git a/test/fields/collections/Blocks/index.ts b/test/fields/collections/Blocks/index.ts
index 59d4cca4c3..25028748b5 100644
--- a/test/fields/collections/Blocks/index.ts
+++ b/test/fields/collections/Blocks/index.ts
@@ -1,5 +1,5 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
-import type { BlockField } from '../../../../packages/payload/src/fields/config/types.js'
+import type { CollectionConfig } from 'payload/types'
+import type { BlockField } from 'payload/types'
 
 import { blockFieldsSlug, textFieldsSlug } from '../../slugs.js'
 import { AddCustomBlocks } from './components/AddCustomBlocks/index.js'
diff --git a/test/fields/collections/Checkbox/index.ts b/test/fields/collections/Checkbox/index.ts
index 37c729285f..5802522e1e 100644
--- a/test/fields/collections/Checkbox/index.ts
+++ b/test/fields/collections/Checkbox/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { checkboxFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Code/index.tsx b/test/fields/collections/Code/index.tsx
index b7164e6647..32b265b8d8 100644
--- a/test/fields/collections/Code/index.tsx
+++ b/test/fields/collections/Code/index.tsx
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { codeFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Collapsible/LabelComponent.tsx b/test/fields/collections/Collapsible/LabelComponent.tsx
index fb9b319429..1e7e548aa0 100644
--- a/test/fields/collections/Collapsible/LabelComponent.tsx
+++ b/test/fields/collections/Collapsible/LabelComponent.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import type { RowLabelComponent } from 'payload/types'
 
-import type { RowLabelComponent } from '../../../../packages/payload/src/admin/forms/RowLabel.js'
+import React from 'react'
 
 export const CollapsibleLabelComponent: RowLabelComponent = ({ data }) => {
   return (
diff --git a/test/fields/collections/Collapsible/index.ts b/test/fields/collections/Collapsible/index.ts
index 8b7bb292b6..d65e263046 100644
--- a/test/fields/collections/Collapsible/index.ts
+++ b/test/fields/collections/Collapsible/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { collapsibleFieldsSlug } from '../../slugs.js'
 import { CollapsibleLabelComponent } from './LabelComponent.js'
diff --git a/test/fields/collections/ConditionalLogic/index.ts b/test/fields/collections/ConditionalLogic/index.ts
index 94c90e17a2..9e3c670386 100644
--- a/test/fields/collections/ConditionalLogic/index.ts
+++ b/test/fields/collections/ConditionalLogic/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { conditionalLogicSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Date/index.ts b/test/fields/collections/Date/index.ts
index 07859fa54f..85a029858c 100644
--- a/test/fields/collections/Date/index.ts
+++ b/test/fields/collections/Date/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { dateFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Group/index.ts b/test/fields/collections/Group/index.ts
index 7547570fe7..a5d5bab8e6 100644
--- a/test/fields/collections/Group/index.ts
+++ b/test/fields/collections/Group/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { groupFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Indexed/index.ts b/test/fields/collections/Indexed/index.ts
index ce3ab3f439..1c3a3744ba 100644
--- a/test/fields/collections/Indexed/index.ts
+++ b/test/fields/collections/Indexed/index.ts
@@ -1,7 +1,4 @@
-import type {
-  BeforeDuplicate,
-  CollectionConfig,
-} from '../../../../packages/payload/src/collections/config/types.js'
+import type { BeforeDuplicate, CollectionConfig } from 'payload/types'
 import type { IndexedField } from '../../payload-types.js'
 
 import { indexedFieldsSlug } from '../../slugs.js'
diff --git a/test/fields/collections/JSON/index.tsx b/test/fields/collections/JSON/index.tsx
index c859634ea0..8d9f3eada1 100644
--- a/test/fields/collections/JSON/index.tsx
+++ b/test/fields/collections/JSON/index.tsx
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { jsonFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Lexical/blocks.ts b/test/fields/collections/Lexical/blocks.ts
index 6391bb4a80..af0cd1e111 100644
--- a/test/fields/collections/Lexical/blocks.ts
+++ b/test/fields/collections/Lexical/blocks.ts
@@ -1,6 +1,7 @@
-import type { ArrayField, Block } from '../../../../packages/payload/src/fields/config/types.js'
+import type { ArrayField, Block } from 'payload/types'
+
+import { lexicalEditor } from '@payloadcms/richtext-lexical'
 
-import { lexicalEditor } from '../../../../packages/richtext-lexical/src/index.js'
 import { textFieldsSlug } from '../Text/shared.js'
 
 export const BlockColumns = ({ name }: { name: string }): ArrayField => ({
diff --git a/test/fields/collections/Lexical/index.ts b/test/fields/collections/Lexical/index.ts
index 18f007e60f..449999aa66 100644
--- a/test/fields/collections/Lexical/index.ts
+++ b/test/fields/collections/Lexical/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import {
   BlocksFeature,
@@ -6,7 +6,7 @@ import {
   TreeViewFeature,
   UploadFeature,
   lexicalEditor,
-} from '../../../../packages/richtext-lexical/src/index.js'
+} from '@payloadcms/richtext-lexical'
 import { lexicalFieldsSlug } from '../../slugs.js'
 import {
   ConditionalLayoutBlock,
diff --git a/test/fields/collections/LexicalMigrate/index.ts b/test/fields/collections/LexicalMigrate/index.ts
index 25dbd7d0f9..1316070a1b 100644
--- a/test/fields/collections/LexicalMigrate/index.ts
+++ b/test/fields/collections/LexicalMigrate/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import {
   HTMLConverterFeature,
@@ -9,7 +9,7 @@ import {
   UploadFeature,
   lexicalEditor,
   lexicalHTML,
-} from '../../../../packages/richtext-lexical/src/index.js'
+} from '@payloadcms/richtext-lexical'
 import { lexicalMigrateFieldsSlug } from '../../slugs.js'
 import { getSimpleLexicalData } from './data.js'
 
diff --git a/test/fields/collections/Number/index.ts b/test/fields/collections/Number/index.ts
index 1df299e1c6..207ec2fba9 100644
--- a/test/fields/collections/Number/index.ts
+++ b/test/fields/collections/Number/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { numberFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Point/index.ts b/test/fields/collections/Point/index.ts
index ff674439d7..ba9c0184e4 100644
--- a/test/fields/collections/Point/index.ts
+++ b/test/fields/collections/Point/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { pointFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Radio/index.ts b/test/fields/collections/Radio/index.ts
index 8fd5e112eb..833dd634b9 100644
--- a/test/fields/collections/Radio/index.ts
+++ b/test/fields/collections/Radio/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { radioFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Relationship/index.ts b/test/fields/collections/Relationship/index.ts
index 83857d219c..014a39d4b5 100644
--- a/test/fields/collections/Relationship/index.ts
+++ b/test/fields/collections/Relationship/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { relationshipFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/RichText/blocks.ts b/test/fields/collections/RichText/blocks.ts
index 5d4745fe00..13e3d20eac 100644
--- a/test/fields/collections/RichText/blocks.ts
+++ b/test/fields/collections/RichText/blocks.ts
@@ -1,6 +1,6 @@
-import type { Block } from '../../../../packages/payload/src/fields/config/types.js'
+import type { Block } from 'payload/types'
 
-import { lexicalEditor } from '../../../../packages/richtext-lexical/src/index.js'
+import { lexicalEditor } from '@payloadcms/richtext-lexical'
 
 export const TextBlock: Block = {
   fields: [
diff --git a/test/fields/collections/RichText/index.ts b/test/fields/collections/RichText/index.ts
index 245a107b32..a3b0aaa879 100644
--- a/test/fields/collections/RichText/index.ts
+++ b/test/fields/collections/RichText/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { lexicalHTML } from '../../../../packages/richtext-lexical/src/field/features/converters/html/field/index.js'
 import {
@@ -8,8 +8,8 @@ import {
   TreeViewFeature,
   UploadFeature,
   lexicalEditor,
-} from '../../../../packages/richtext-lexical/src/index.js'
-import { slateEditor } from '../../../../packages/richtext-slate/src/index.js'
+} from '@payloadcms/richtext-lexical'
+import { slateEditor } from '@payloadcms/richtext-slate'
 import { richTextFieldsSlug } from '../../slugs.js'
 import { RelationshipBlock, SelectFieldBlock, TextBlock, UploadAndRichTextBlock } from './blocks.js'
 
diff --git a/test/fields/collections/Row/index.ts b/test/fields/collections/Row/index.ts
index fbe68af495..bda9997cbb 100644
--- a/test/fields/collections/Row/index.ts
+++ b/test/fields/collections/Row/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { rowFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Select/index.ts b/test/fields/collections/Select/index.ts
index f2d984e1a4..3afc7f17c4 100644
--- a/test/fields/collections/Select/index.ts
+++ b/test/fields/collections/Select/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { selectFieldsSlug } from '../../slugs.js'
 
diff --git a/test/fields/collections/Tabs/index.ts b/test/fields/collections/Tabs/index.ts
index 79d5933ff5..9e891793ba 100644
--- a/test/fields/collections/Tabs/index.ts
+++ b/test/fields/collections/Tabs/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { tabsFieldsSlug } from '../../slugs.js'
 import { getBlocksField } from '../Blocks/index.js'
diff --git a/test/fields/collections/Text/CustomError.tsx b/test/fields/collections/Text/CustomError.tsx
index ab5325e9b8..0ed81b661e 100644
--- a/test/fields/collections/Text/CustomError.tsx
+++ b/test/fields/collections/Text/CustomError.tsx
@@ -2,8 +2,8 @@
 
 import React from 'react'
 
-import { useFormFields, useFormSubmitted } from '../../../../packages/ui/src/forms/Form/context.js'
-import { useField } from '../../../../packages/ui/src/forms/useField/index.js'
+import { useFormFields, useFormSubmitted } from '@payloadcms/ui'
+import { useField } from '@payloadcms/ui'
 
 const CustomError: React.FC<any> = (props) => {
   const { path: pathFromProps } = props
diff --git a/test/fields/collections/Text/CustomLabel.tsx b/test/fields/collections/Text/CustomLabel.tsx
index eacf5b0433..52682363e0 100644
--- a/test/fields/collections/Text/CustomLabel.tsx
+++ b/test/fields/collections/Text/CustomLabel.tsx
@@ -1,11 +1,10 @@
 'use client'
 
+import { useFieldPath } from '@payloadcms/ui'
 import React from 'react'
 
-import { useFieldProps } from '../../../../packages/ui/src/forms/FieldPropsProvider/index.js'
-
 const CustomLabel = () => {
-  const { path } = useFieldProps()
+  const { path } = useFieldPath()
   return (
     <label className="custom-label" htmlFor={`field-${path.replace(/\./g, '__')}`}>
       #label
diff --git a/test/fields/collections/Text/index.ts b/test/fields/collections/Text/index.ts
index 08b244c202..fa4afccfd9 100644
--- a/test/fields/collections/Text/index.ts
+++ b/test/fields/collections/Text/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { AfterInput } from './AfterInput.js'
 import { BeforeInput } from './BeforeInput.js'
diff --git a/test/fields/collections/Upload/index.ts b/test/fields/collections/Upload/index.ts
index 2c5b3dc5cc..d87212d482 100644
--- a/test/fields/collections/Upload/index.ts
+++ b/test/fields/collections/Upload/index.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { uploadsSlug } from '../../slugs.js'
 const filename = fileURLToPath(import.meta.url)
diff --git a/test/fields/collections/Upload2/index.ts b/test/fields/collections/Upload2/index.ts
index 5c8b62cff9..232f9e2e90 100644
--- a/test/fields/collections/Upload2/index.ts
+++ b/test/fields/collections/Upload2/index.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { uploads2Slug } from '../../slugs.js'
 const filename = fileURLToPath(import.meta.url)
diff --git a/test/fields/collections/Uploads3/index.ts b/test/fields/collections/Uploads3/index.ts
index 809fff8a27..767a53dc39 100644
--- a/test/fields/collections/Uploads3/index.ts
+++ b/test/fields/collections/Uploads3/index.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { uploads3Slug } from '../../slugs.js'
 const filename = fileURLToPath(import.meta.url)
diff --git a/test/fields/config.ts b/test/fields/config.ts
index 70ba4cd2f0..4d953390bf 100644
--- a/test/fields/config.ts
+++ b/test/fields/config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import ArrayFields from './collections/Array/index.js'
diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index f6f8c4cc82..0f1e99cb1b 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { RelationshipField, TextField } from './payload-types.js'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
diff --git a/test/fields/globals/TabsWithRichText.ts b/test/fields/globals/TabsWithRichText.ts
index 8df434fd3f..08c4c3fac5 100644
--- a/test/fields/globals/TabsWithRichText.ts
+++ b/test/fields/globals/TabsWithRichText.ts
@@ -5,9 +5,9 @@
  * - each tab has a different label in each language. Needs to be a LOCALIZED label, not a single label for all languages. Only then can it be reproduced
  */
 
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
-import { lexicalEditor } from '../../../packages/richtext-lexical/src/index.js'
+import { lexicalEditor } from '@payloadcms/richtext-lexical'
 
 const initializedEditor = lexicalEditor()
 
diff --git a/test/fields/int.spec.ts b/test/fields/int.spec.ts
index 065ad75a6c..392aeee4f4 100644
--- a/test/fields/int.spec.ts
+++ b/test/fields/int.spec.ts
@@ -1,12 +1,13 @@
+import type { MongooseAdapter } from '@payloadcms/db-mongodb'
 import type { IndexDirection, IndexOptions } from 'mongoose'
+import type { Payload } from 'payload'
+import type { PaginatedDocs } from 'payload/database'
+
+import { getPayload } from 'payload'
 
-import type { MongooseAdapter } from '../../packages/db-mongodb/src/index.js'
-import type { PaginatedDocs } from '../../packages/payload/src/database/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 import type { GroupField, RichTextField } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
 import { devUser } from '../credentials.js'
 import { isMongoose } from '../helpers/isMongoose.js'
 import { startMemoryDB } from '../startMemoryDB.js'
diff --git a/test/fields/lexical.e2e.spec.ts b/test/fields/lexical.e2e.spec.ts
index 8e1a1c21e7..26731fffa2 100644
--- a/test/fields/lexical.e2e.spec.ts
+++ b/test/fields/lexical.e2e.spec.ts
@@ -1,12 +1,12 @@
+import type { SerializedBlockNode } from '@payloadcms/richtext-lexical'
 import type { Page } from '@playwright/test'
 import type { SerializedEditorState, SerializedParagraphNode, SerializedTextNode } from 'lexical'
+import type { Payload } from 'payload'
 
 import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
-import type { SerializedBlockNode } from '../../packages/richtext-lexical/src/index.js'
 import type { LexicalField } from './payload-types.js'
 
 import { initPageConsoleErrorCatch, saveDocAndAssert } from '../helpers.js'
@@ -20,7 +20,7 @@ import { lexicalFieldsSlug } from './slugs.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
-const { beforeAll, describe, beforeEach } = test
+const { beforeAll, beforeEach, describe } = test
 
 let payload: Payload
 let client: RESTClient
@@ -42,7 +42,7 @@ async function navigateToLexicalFields() {
 describe('lexical', () => {
   beforeAll(async ({ browser }) => {
     ;({ payload, serverURL } = await initPayloadE2E({ config, dirname }))
-    client = new RESTClient(null, { serverURL, defaultSlug: 'rich-text-fields' })
+    client = new RESTClient(null, { defaultSlug: 'rich-text-fields', serverURL })
     await client.login()
 
     const context = await browser.newContext()
@@ -53,7 +53,7 @@ describe('lexical', () => {
   beforeEach(async () => {
     await clearAndSeedEverything(payload)
     await client.logout()
-    client = new RESTClient(null, { serverURL, defaultSlug: 'rich-text-fields' })
+    client = new RESTClient(null, { defaultSlug: 'rich-text-fields', serverURL })
     await client.login()
   })
 
@@ -131,12 +131,12 @@ describe('lexical', () => {
     const lexicalDoc: LexicalField = (
       await payload.find({
         collection: lexicalFieldsSlug,
+        depth: 0,
         where: {
           title: {
             equals: lexicalDocData.title,
           },
         },
-        depth: 0,
       })
     ).docs[0] as never
 
@@ -196,12 +196,12 @@ describe('lexical', () => {
     const lexicalDoc: LexicalField = (
       await payload.find({
         collection: lexicalFieldsSlug,
+        depth: 0,
         where: {
           title: {
             equals: lexicalDocData.title,
           },
         },
-        depth: 0,
       })
     ).docs[0] as never
 
@@ -335,12 +335,12 @@ describe('lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -408,12 +408,12 @@ describe('lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -551,12 +551,12 @@ describe('lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -617,12 +617,12 @@ describe('lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
diff --git a/test/fields/lexical.int.spec.ts b/test/fields/lexical.int.spec.ts
index 598b73d581..2e47950fb4 100644
--- a/test/fields/lexical.int.spec.ts
+++ b/test/fields/lexical.int.spec.ts
@@ -1,16 +1,17 @@
-import type { SerializedEditorState, SerializedParagraphNode } from 'lexical'
-
-import type { PaginatedDocs } from '../../packages/payload/src/database/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
 import type {
   SerializedBlockNode,
   SerializedLinkNode,
   SerializedRelationshipNode,
   SerializedUploadNode,
-} from '../../packages/richtext-lexical/src/index.js'
+} from '@payloadcms/richtext-lexical'
+import type { SerializedEditorState, SerializedParagraphNode } from 'lexical'
+import type { Payload } from 'payload'
+import type { PaginatedDocs } from 'payload/database'
+
+import { getPayload } from 'payload'
+
 import type { LexicalField, LexicalMigrateField, RichTextField } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
 import { devUser } from '../credentials.js'
 import { NextRESTClient } from '../helpers/NextRESTClient.js'
 import { startMemoryDB } from '../startMemoryDB.js'
@@ -105,12 +106,12 @@ describe('Lexical', () => {
       const richTextDoc: RichTextField = (
         await payload.find({
           collection: richTextFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: richTextDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -141,12 +142,12 @@ describe('Lexical', () => {
       const richTextDoc: RichTextField = (
         await payload.find({
           collection: richTextFieldsSlug,
+          depth: 1,
           where: {
             title: {
               equals: richTextDocData.title,
             },
           },
-          depth: 1,
         })
       ).docs[0] as never
 
@@ -181,12 +182,12 @@ describe('Lexical', () => {
       const richTextDoc: RichTextField = (
         await payload.find({
           collection: richTextFieldsSlug,
+          depth: 1,
           where: {
             title: {
               equals: richTextDocData.title,
             },
           },
-          depth: 1,
         })
       ).docs[0] as never
 
@@ -228,12 +229,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalMigrateField = (
         await payload.find({
           collection: lexicalMigrateFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalMigrateDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -244,12 +245,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalMigrateField = (
         await payload.find({
           collection: lexicalMigrateFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalMigrateDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -260,12 +261,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalMigrateField = (
         await payload.find({
           collection: lexicalMigrateFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalMigrateDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -281,12 +282,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -305,12 +306,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 1,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 1,
         })
       ).docs[0] as never
 
@@ -329,12 +330,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -360,12 +361,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 1,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 1,
         })
       ).docs[0] as never
 
@@ -396,12 +397,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 0,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 0,
         })
       ).docs[0] as never
 
@@ -427,12 +428,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 1,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 1,
         })
       ).docs[0] as never
 
@@ -474,12 +475,12 @@ describe('Lexical', () => {
       const lexicalDoc: LexicalField = (
         await payload.find({
           collection: lexicalFieldsSlug,
+          depth: 2,
           where: {
             title: {
               equals: lexicalDocData.title,
             },
           },
-          depth: 2,
         })
       ).docs[0] as never
 
diff --git a/test/fields/seed.ts b/test/fields/seed.ts
index f7e2a083b5..7887ad4e12 100644
--- a/test/fields/seed.ts
+++ b/test/fields/seed.ts
@@ -1,7 +1,7 @@
 import path from 'path'
+import { type Payload } from 'payload'
 import { fileURLToPath } from 'url'
 
-import { type Payload } from '../../packages/payload/src/index.js'
 import getFileByPath from '../../packages/payload/src/uploads/getFileByPath.js'
 import { devUser } from '../credentials.js'
 import { seedDB } from '../helpers/seed.js'
diff --git a/test/globals/int.spec.ts b/test/globals/int.spec.ts
index d0965a7436..b0af4fb974 100644
--- a/test/globals/int.spec.ts
+++ b/test/globals/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/helpers/NextRESTClient.ts b/test/helpers/NextRESTClient.ts
index 65469e6c5f..6b0886c482 100644
--- a/test/helpers/NextRESTClient.ts
+++ b/test/helpers/NextRESTClient.ts
@@ -1,10 +1,9 @@
+import type { SanitizedConfig } from 'payload/config'
+import type { Where } from 'payload/types'
 import type { ParsedQs } from 'qs'
 
 import QueryString from 'qs'
 
-import type { SanitizedConfig } from '../../packages/payload/src/config/types.js'
-import type { Where } from '../../packages/payload/src/types/index.js'
-
 import { GRAPHQL_POST as createGraphqlPOST } from '../../packages/next/src/routes/graphql/index.js'
 import {
   DELETE as createDELETE,
diff --git a/test/helpers/idToString.ts b/test/helpers/idToString.ts
index 890e253c75..4b605c8d67 100644
--- a/test/helpers/idToString.ts
+++ b/test/helpers/idToString.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 export const idToString = (id: number | string, payload: Payload): string =>
   `${payload.db.defaultIDType === 'number' ? id : `"${id}"`}`
diff --git a/test/helpers/initPayloadE2E.ts b/test/helpers/initPayloadE2E.ts
index 7799118893..8687e0071f 100644
--- a/test/helpers/initPayloadE2E.ts
+++ b/test/helpers/initPayloadE2E.ts
@@ -1,11 +1,11 @@
+import type { SanitizedConfig } from 'payload/config'
+
 import { createServer } from 'http'
 import nextImport from 'next'
+import { type Payload } from 'payload'
 import { parse } from 'url'
 
-import type { SanitizedConfig } from '../../packages/payload/src/config/types.js'
-
 import { getPayloadHMR } from '../../packages/next/src/utilities/getPayloadHMR.js'
-import { type Payload } from '../../packages/payload/src/index.js'
 import wait from '../../packages/payload/src/utilities/wait.js'
 import { startMemoryDB } from '../startMemoryDB.js'
 import { createTestHooks } from '../testHooks.js'
diff --git a/test/helpers/initPayloadInt.ts b/test/helpers/initPayloadInt.ts
index 03bdde53b4..2ee2331326 100644
--- a/test/helpers/initPayloadInt.ts
+++ b/test/helpers/initPayloadInt.ts
@@ -1,6 +1,7 @@
-import type { SanitizedConfig } from '../../packages/payload/src/config/types.js'
+import type { SanitizedConfig } from 'payload/config'
+
+import { type Payload, getPayload } from 'payload'
 
-import { type Payload, getPayload } from '../../packages/payload/src/index.js'
 import { startMemoryDB } from '../startMemoryDB.js'
 import { NextRESTClient } from './NextRESTClient.js'
 
diff --git a/test/helpers/isMongoose.ts b/test/helpers/isMongoose.ts
index 7865ddf46e..2e44ead72c 100644
--- a/test/helpers/isMongoose.ts
+++ b/test/helpers/isMongoose.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 export function isMongoose(_payload?: Payload) {
   return _payload?.db?.name === 'mongoose' || ['mongoose'].includes(process.env.PAYLOAD_DATABASE)
diff --git a/test/helpers/reset.ts b/test/helpers/reset.ts
index 18cbd416be..a934d2c007 100644
--- a/test/helpers/reset.ts
+++ b/test/helpers/reset.ts
@@ -1,7 +1,7 @@
-import { sql } from 'drizzle-orm'
+import type { PostgresAdapter } from '@payloadcms/db-postgres/types'
+import type { Payload } from 'payload'
 
-import type { PostgresAdapter } from '../../packages/db-postgres/src/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
+import { sql } from 'drizzle-orm'
 
 import { isMongoose } from './isMongoose.js'
 
diff --git a/test/helpers/rest.ts b/test/helpers/rest.ts
index 5f1a38e34a..8405455811 100644
--- a/test/helpers/rest.ts
+++ b/test/helpers/rest.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import qs from 'qs'
+import type { Config } from 'payload/config'
+import type { PaginatedDocs } from 'payload/database'
+import type { Where } from 'payload/types'
 
-import type { Config } from '../../packages/payload/src/config/types.js'
-import type { PaginatedDocs } from '../../packages/payload/src/database/types.js'
-import type { Where } from '../../packages/payload/src/types/index.js'
+import qs from 'qs'
 
 import { devUser } from '../credentials.js'
 
diff --git a/test/helpers/seed.ts b/test/helpers/seed.ts
index a5f9b30eaf..a9e83b13bd 100644
--- a/test/helpers/seed.ts
+++ b/test/helpers/seed.ts
@@ -1,9 +1,9 @@
-import type { MongooseAdapter } from 'packages/db-mongodb/src/index.js'
+import type { MongooseAdapter } from '@payloadcms/db-mongodb'
 
 import fs from 'fs'
 import path from 'path'
+import { type Payload } from 'payload'
 
-import { type Payload } from '../../packages/payload/src/index.js'
 import { isMongoose } from './isMongoose.js'
 import { resetDB } from './reset.js'
 import { createSnapshot, dbSnapshot, restoreFromSnapshot } from './snapshot.js'
diff --git a/test/helpers/snapshot.ts b/test/helpers/snapshot.ts
index 06986f985b..1b8f83d170 100644
--- a/test/helpers/snapshot.ts
+++ b/test/helpers/snapshot.ts
@@ -1,10 +1,9 @@
+import type { PostgresAdapter } from '@payloadcms/db-postgres/types'
 import type { PgTable } from 'drizzle-orm/pg-core'
+import type { Payload } from 'payload'
 
 import { sql } from 'drizzle-orm'
 
-import type { PostgresAdapter } from '../../packages/db-postgres/src/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
-
 import { isMongoose } from './isMongoose.js'
 
 export const dbSnapshot = {}
diff --git a/test/hooks/collections/AfterOperation/index.ts b/test/hooks/collections/AfterOperation/index.ts
index c49f13f05a..eb76851186 100644
--- a/test/hooks/collections/AfterOperation/index.ts
+++ b/test/hooks/collections/AfterOperation/index.ts
@@ -1,7 +1,4 @@
-import type {
-  AfterOperationHook,
-  CollectionConfig,
-} from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionAfterOperationHook, CollectionConfig } from 'payload/types'
 
 import { AfterOperation } from '../../payload-types.js'
 
@@ -12,7 +9,7 @@ const AfterOperation: CollectionConfig = {
   hooks: {
     // beforeRead: [(operation) => operation.doc],
     afterOperation: [
-      async ({ result, operation }) => {
+      ({ result, operation }) => {
         if (operation === 'create') {
           if ('docs' in result) {
             return {
@@ -65,7 +62,7 @@ const AfterOperation: CollectionConfig = {
 
         return result
       },
-    ] as AfterOperationHook<AfterOperation>[],
+    ] as CollectionAfterOperationHook<AfterOperation>[],
   },
   fields: [
     {
diff --git a/test/hooks/collections/ChainingHooks/index.ts b/test/hooks/collections/ChainingHooks/index.ts
index b8e9223913..e2c93f0cad 100644
--- a/test/hooks/collections/ChainingHooks/index.ts
+++ b/test/hooks/collections/ChainingHooks/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const chainingHooksSlug = 'chaining-hooks'
 
diff --git a/test/hooks/collections/ContextHooks/index.ts b/test/hooks/collections/ContextHooks/index.ts
index 7b594ac917..fcfb05c9e8 100644
--- a/test/hooks/collections/ContextHooks/index.ts
+++ b/test/hooks/collections/ContextHooks/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
-import type { PayloadRequest } from '../../../../packages/payload/src/types/index.js'
+import type { CollectionConfig } from 'payload/types'
+import type { PayloadRequest } from 'payload/types'
 
 export const contextHooksSlug = 'context-hooks'
 const ContextHooks: CollectionConfig = {
diff --git a/test/hooks/collections/Data/index.ts b/test/hooks/collections/Data/index.ts
index 933d0a6c30..7102155637 100644
--- a/test/hooks/collections/Data/index.ts
+++ b/test/hooks/collections/Data/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const dataHooksSlug = 'data-hooks'
 
@@ -14,7 +14,7 @@ export const DataHooks: CollectionConfig = {
   },
   hooks: {
     beforeOperation: [
-      async ({ context, collection, args }) => {
+      ({ context, collection, args }) => {
         context['collection_beforeOperation_collection'] = JSON.stringify(collection)
 
         return args
@@ -29,12 +29,12 @@ export const DataHooks: CollectionConfig = {
       },
     ],
     afterChange: [
-      async ({ context, collection }) => {
+      ({ context, collection }) => {
         context['collection_afterChange_collection'] = JSON.stringify(collection)
       },
     ],
     beforeRead: [
-      async ({ context, collection }) => {
+      ({ context, collection }) => {
         context['collection_beforeRead_collection'] = JSON.stringify(collection)
       },
     ],
diff --git a/test/hooks/collections/Hook/index.ts b/test/hooks/collections/Hook/index.ts
index 83d6c204be..e50a75723f 100644
--- a/test/hooks/collections/Hook/index.ts
+++ b/test/hooks/collections/Hook/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const hooksSlug = 'hooks'
 const Hooks: CollectionConfig = {
diff --git a/test/hooks/collections/NestedAfterReadHooks/index.ts b/test/hooks/collections/NestedAfterReadHooks/index.ts
index 1a1cf48eec..24235f36f7 100644
--- a/test/hooks/collections/NestedAfterReadHooks/index.ts
+++ b/test/hooks/collections/NestedAfterReadHooks/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { relationsSlug } from '../Relations/index.js'
 
diff --git a/test/hooks/collections/Relations/index.ts b/test/hooks/collections/Relations/index.ts
index aa011f5402..7371ff6783 100644
--- a/test/hooks/collections/Relations/index.ts
+++ b/test/hooks/collections/Relations/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const relationsSlug = 'relations'
 
diff --git a/test/hooks/collections/Transform/index.ts b/test/hooks/collections/Transform/index.ts
index fe729557d2..0a9773a064 100644
--- a/test/hooks/collections/Transform/index.ts
+++ b/test/hooks/collections/Transform/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 const validateFieldTransformAction = (hook: string, value) => {
   if (value !== undefined && value !== null && !Array.isArray(value)) {
diff --git a/test/hooks/collections/Users/afterLoginHook.ts b/test/hooks/collections/Users/afterLoginHook.ts
index b6a71527ba..bf43750d1d 100644
--- a/test/hooks/collections/Users/afterLoginHook.ts
+++ b/test/hooks/collections/Users/afterLoginHook.ts
@@ -1,6 +1,6 @@
-import type { AfterLoginHook } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionAfterLoginHook } from 'payload/types'
 
-export const afterLoginHook: AfterLoginHook = async ({ req, user }) => {
+export const afterLoginHook: CollectionAfterLoginHook = async ({ req, user }) => {
   return req.payload.update({
     id: user.id,
     collection: 'hooks-users',
diff --git a/test/hooks/collections/Users/index.ts b/test/hooks/collections/Users/index.ts
index f6aeba6ce5..d0f96d555c 100644
--- a/test/hooks/collections/Users/index.ts
+++ b/test/hooks/collections/Users/index.ts
@@ -1,10 +1,8 @@
-import type {
-  BeforeLoginHook,
-  CollectionConfig,
-} from '../../../../packages/payload/src/collections/config/types.js'
-import type { Payload } from '../../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+import type { BeforeLoginHook, CollectionConfig } from 'payload/types'
+
+import { AuthenticationError } from 'payload/errors'
 
-import { AuthenticationError } from '../../../../packages/payload/src/errors/index.js'
 import { devUser, regularUser } from '../../../credentials.js'
 import { afterLoginHook } from './afterLoginHook.js'
 
diff --git a/test/hooks/config.ts b/test/hooks/config.ts
index 1d096e2b73..a0a6439adf 100644
--- a/test/hooks/config.ts
+++ b/test/hooks/config.ts
@@ -1,4 +1,4 @@
-import type { SanitizedConfig } from '../../packages/payload/src/config/types.js'
+import type { SanitizedConfig } from 'payload/config'
 
 import { APIError } from '../../packages/payload/errors.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
diff --git a/test/hooks/globals/Data/index.ts b/test/hooks/globals/Data/index.ts
index d35b26b2e3..2cd1091264 100644
--- a/test/hooks/globals/Data/index.ts
+++ b/test/hooks/globals/Data/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 
-import type { GlobalConfig } from '../../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 export const dataHooksGlobalSlug = 'data-hooks-global'
 
@@ -19,7 +19,7 @@ export const DataHooksGlobal: GlobalConfig = {
       },
     ],
     beforeRead: [
-      async ({ context, global }) => {
+      ({ context, global }) => {
         context['global_beforeRead_global'] = JSON.stringify(global)
       },
     ],
@@ -37,7 +37,7 @@ export const DataHooksGlobal: GlobalConfig = {
       },
     ],
     afterChange: [
-      async ({ context, global, doc }) => {
+      ({ context, global, doc }) => {
         context['global_afterChange_global'] = JSON.stringify(global)
 
         // Needs to be done for both afterRead (for findOne test) and afterChange (for update test), as afterChange is called after afterRead
diff --git a/test/hooks/int.spec.ts b/test/hooks/int.spec.ts
index 283220fa97..e935f59087 100644
--- a/test/hooks/int.spec.ts
+++ b/test/hooks/int.spec.ts
@@ -1,8 +1,10 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
+import { AuthenticationError } from 'payload/errors'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 import type { NestedAfterReadHook } from './payload-types.js'
 
-import { AuthenticationError } from '../../packages/payload/src/errors/index.js'
 import { devUser, regularUser } from '../credentials.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import { afterOperationSlug } from './collections/AfterOperation/index.js'
diff --git a/test/live-preview/blocks/ArchiveBlock/index.ts b/test/live-preview/blocks/ArchiveBlock/index.ts
index 3d364b95bb..f5caba7184 100644
--- a/test/live-preview/blocks/ArchiveBlock/index.ts
+++ b/test/live-preview/blocks/ArchiveBlock/index.ts
@@ -1,6 +1,6 @@
-import type { Block } from '../../../../packages/payload/src/fields/config/types.js'
+import type { Block } from 'payload/types'
 
-import { slateEditor } from '../../../../packages/richtext-slate/src/index.js'
+import { slateEditor } from '@payloadcms/richtext-slate'
 
 export const Archive: Block = {
   slug: 'archive',
diff --git a/test/live-preview/blocks/CallToAction/index.ts b/test/live-preview/blocks/CallToAction/index.ts
index 0fb152dbae..4ef3b629a7 100644
--- a/test/live-preview/blocks/CallToAction/index.ts
+++ b/test/live-preview/blocks/CallToAction/index.ts
@@ -1,6 +1,7 @@
-import type { Block } from '../../../../packages/payload/src/fields/config/types.js'
+import type { Block } from 'payload/types'
+
+import { slateEditor } from '@payloadcms/richtext-slate'
 
-import { slateEditor } from '../../../../packages/richtext-slate/src/index.js'
 import { invertBackground } from '../../fields/invertBackground.js'
 import linkGroup from '../../fields/linkGroup.js'
 
diff --git a/test/live-preview/blocks/Content/index.ts b/test/live-preview/blocks/Content/index.ts
index ae98d7c5e0..b8a03491c3 100644
--- a/test/live-preview/blocks/Content/index.ts
+++ b/test/live-preview/blocks/Content/index.ts
@@ -1,6 +1,7 @@
-import type { Block, Field } from '../../../../packages/payload/src/fields/config/types.js'
+import type { Block, Field } from 'payload/types'
+
+import { slateEditor } from '@payloadcms/richtext-slate'
 
-import { slateEditor } from '../../../../packages/richtext-slate/src/index.js'
 import { invertBackground } from '../../fields/invertBackground.js'
 import link from '../../fields/link.js'
 
diff --git a/test/live-preview/blocks/MediaBlock/index.ts b/test/live-preview/blocks/MediaBlock/index.ts
index da06b24fd0..592accaad8 100644
--- a/test/live-preview/blocks/MediaBlock/index.ts
+++ b/test/live-preview/blocks/MediaBlock/index.ts
@@ -1,4 +1,4 @@
-import type { Block } from '../../../../packages/payload/src/fields/config/types.js'
+import type { Block } from 'payload/types'
 
 import { invertBackground } from '../../fields/invertBackground.js'
 
diff --git a/test/live-preview/collections/Categories.ts b/test/live-preview/collections/Categories.ts
index 2d03307133..479dae86a1 100644
--- a/test/live-preview/collections/Categories.ts
+++ b/test/live-preview/collections/Categories.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 const Categories: CollectionConfig = {
   slug: 'categories',
diff --git a/test/live-preview/collections/Media.ts b/test/live-preview/collections/Media.ts
index c18ae89a36..214350e0b9 100644
--- a/test/live-preview/collections/Media.ts
+++ b/test/live-preview/collections/Media.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Media: CollectionConfig = {
   slug: 'media',
diff --git a/test/live-preview/collections/Pages.ts b/test/live-preview/collections/Pages.ts
index 7076c9093f..836097563c 100644
--- a/test/live-preview/collections/Pages.ts
+++ b/test/live-preview/collections/Pages.ts
@@ -1,7 +1,7 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
-import { lexicalEditor } from '../../../packages/richtext-lexical/src/index.js'
-import { slateEditor } from '../../../packages/richtext-slate/src/index.js'
+import { lexicalEditor } from '@payloadcms/richtext-lexical'
+import { slateEditor } from '@payloadcms/richtext-slate'
 import { Archive } from '../blocks/ArchiveBlock/index.js'
 import { CallToAction } from '../blocks/CallToAction/index.js'
 import { Content } from '../blocks/Content/index.js'
diff --git a/test/live-preview/collections/Posts.ts b/test/live-preview/collections/Posts.ts
index 7ca0d547f5..1125db16c6 100644
--- a/test/live-preview/collections/Posts.ts
+++ b/test/live-preview/collections/Posts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { Archive } from '../blocks/ArchiveBlock/index.js'
 import { CallToAction } from '../blocks/CallToAction/index.js'
diff --git a/test/live-preview/collections/Tenants.ts b/test/live-preview/collections/Tenants.ts
index 2f99b73aef..a331e8d5de 100644
--- a/test/live-preview/collections/Tenants.ts
+++ b/test/live-preview/collections/Tenants.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { tenantsSlug } from '../shared.js'
 
diff --git a/test/live-preview/collections/Users.ts b/test/live-preview/collections/Users.ts
index 06b4db1ff6..5ed1d6b078 100644
--- a/test/live-preview/collections/Users.ts
+++ b/test/live-preview/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/live-preview/e2e.spec.ts b/test/live-preview/e2e.spec.ts
index f37267380d..9c578250b5 100644
--- a/test/live-preview/e2e.spec.ts
+++ b/test/live-preview/e2e.spec.ts
@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
 import { exactText, initPageConsoleErrorCatch, saveDocAndAssert } from '../helpers.js'
diff --git a/test/live-preview/fields/hero.ts b/test/live-preview/fields/hero.ts
index 4f74458794..d3fb1e9197 100644
--- a/test/live-preview/fields/hero.ts
+++ b/test/live-preview/fields/hero.ts
@@ -1,6 +1,6 @@
-import type { Field } from '../../../packages/payload/src/fields/config/types.js'
+import type { Field } from 'payload/types'
 
-import { slateEditor } from '../../../packages/richtext-slate/src/index.js'
+import { slateEditor } from '@payloadcms/richtext-slate'
 
 export const hero: Field = {
   name: 'hero',
diff --git a/test/live-preview/fields/invertBackground.ts b/test/live-preview/fields/invertBackground.ts
index 1b13dc9296..c9741a0a43 100644
--- a/test/live-preview/fields/invertBackground.ts
+++ b/test/live-preview/fields/invertBackground.ts
@@ -1,4 +1,4 @@
-import type { CheckboxField } from '../../../packages/payload/src/fields/config/types.js'
+import type { CheckboxField } from 'payload/types'
 
 export const invertBackground: CheckboxField = {
   name: 'invertBackground',
diff --git a/test/live-preview/fields/link.ts b/test/live-preview/fields/link.ts
index e16413aeee..3997375d38 100644
--- a/test/live-preview/fields/link.ts
+++ b/test/live-preview/fields/link.ts
@@ -1,4 +1,4 @@
-import type { Field } from '../../../packages/payload/src/fields/config/types.js'
+import type { Field } from 'payload/types'
 
 import deepMerge from '../utilities/deepMerge.js'
 
diff --git a/test/live-preview/fields/linkGroup.ts b/test/live-preview/fields/linkGroup.ts
index c448a24dd8..a8a46d98cb 100644
--- a/test/live-preview/fields/linkGroup.ts
+++ b/test/live-preview/fields/linkGroup.ts
@@ -1,4 +1,5 @@
-import type { ArrayField, Field } from '../../../packages/payload/src/fields/config/types.js'
+import type { ArrayField, Field } from 'payload/types'
+
 import type { LinkAppearances } from './link.js'
 
 import deepMerge from '../utilities/deepMerge.js'
diff --git a/test/live-preview/globals/Footer.ts b/test/live-preview/globals/Footer.ts
index 9300fbf832..73aa2f4df7 100644
--- a/test/live-preview/globals/Footer.ts
+++ b/test/live-preview/globals/Footer.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import GlobalLivePreviewButton from '../components/GlobalLivePreviewButton/index.js'
 import link from '../fields/link.js'
diff --git a/test/live-preview/globals/Header.ts b/test/live-preview/globals/Header.ts
index e1b8d3e9fb..65f18cf2b7 100644
--- a/test/live-preview/globals/Header.ts
+++ b/test/live-preview/globals/Header.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import link from '../fields/link.js'
 
diff --git a/test/live-preview/int.spec.ts b/test/live-preview/int.spec.ts
index 21d4d1cae9..5a0eb82b2c 100644
--- a/test/live-preview/int.spec.ts
+++ b/test/live-preview/int.spec.ts
@@ -1,7 +1,8 @@
+import type { Payload } from 'payload'
+
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 import type { Media, Page, Post, Tenant } from './payload-types.js'
 
@@ -9,7 +10,6 @@ import { handleMessage } from '../../packages/live-preview/src/handleMessage.js'
 import { mergeData } from '../../packages/live-preview/src/mergeData.js'
 import { traverseRichText } from '../../packages/live-preview/src/traverseRichText.js'
 import getFileByPath from '../../packages/payload/src/uploads/getFileByPath.js'
-import { fieldSchemaToJSON } from '../../packages/payload/src/utilities/fieldSchemaToJSON.js'
 import { Pages } from './collections/Pages.js'
 import { postsSlug } from './collections/Posts.js'
 import configPromise from './config.js'
@@ -23,6 +23,8 @@ const schemaJSON = fieldSchemaToJSON(Pages.fields)
 let payload: Payload
 let restClient: NextRESTClient
 
+import { fieldSchemaToJSON } from 'payload/utilities'
+
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 
 function collectionPopulationRequestHandler({ endpoint }: { endpoint: string }) {
diff --git a/test/live-preview/seed/index.ts b/test/live-preview/seed/index.ts
index b2fd470a49..a0def743a7 100644
--- a/test/live-preview/seed/index.ts
+++ b/test/live-preview/seed/index.ts
@@ -1,8 +1,8 @@
+import type { Config } from 'payload/config'
+
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Config } from '../../../packages/payload/src/config/types.js'
-
 import { devUser } from '../../credentials.js'
 import removeFiles from '../../helpers/removeFiles.js'
 import { postsSlug } from '../collections/Posts.js'
diff --git a/test/live-preview/startLivePreviewDemo.ts b/test/live-preview/startLivePreviewDemo.ts
index e3e5af9260..529b387cff 100644
--- a/test/live-preview/startLivePreviewDemo.ts
+++ b/test/live-preview/startLivePreviewDemo.ts
@@ -4,7 +4,7 @@ import { spawn } from 'child_process'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
diff --git a/test/live-preview/utilities/formatSlug.ts b/test/live-preview/utilities/formatSlug.ts
index 80fd7b726f..bb33fc1f54 100644
--- a/test/live-preview/utilities/formatSlug.ts
+++ b/test/live-preview/utilities/formatSlug.ts
@@ -1,4 +1,4 @@
-import type { FieldHook } from '../../../packages/payload/src/fields/config/types.js'
+import type { FieldHook } from 'payload/types'
 
 const format = (val: string): string =>
   val
diff --git a/test/localization-rtl/collections/posts.ts b/test/localization-rtl/collections/posts.ts
index 06dd7a733a..de251111da 100644
--- a/test/localization-rtl/collections/posts.ts
+++ b/test/localization-rtl/collections/posts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Posts: CollectionConfig = {
   slug: 'posts',
diff --git a/test/localization-rtl/collections/users.ts b/test/localization-rtl/collections/users.ts
index 8c5c7a0b2d..7612412dc2 100644
--- a/test/localization-rtl/collections/users.ts
+++ b/test/localization-rtl/collections/users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/localization/collections/Array/index.ts b/test/localization/collections/Array/index.ts
index 2eb781cd0a..2d8593daaa 100644
--- a/test/localization/collections/Array/index.ts
+++ b/test/localization/collections/Array/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const arrayCollectionSlug = 'array-fields'
 
diff --git a/test/localization/collections/NestedToArrayAndBlock/index.ts b/test/localization/collections/NestedToArrayAndBlock/index.ts
index 5cc3f17cb5..1184b1e851 100644
--- a/test/localization/collections/NestedToArrayAndBlock/index.ts
+++ b/test/localization/collections/NestedToArrayAndBlock/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const nestedToArrayAndBlockCollectionSlug = 'nested-to-array-and-block'
 
diff --git a/test/localization/e2e.spec.ts b/test/localization/e2e.spec.ts
index f6e4d7cd62..1a257dc0f5 100644
--- a/test/localization/e2e.spec.ts
+++ b/test/localization/e2e.spec.ts
@@ -1,10 +1,10 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload'
 
 import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { LocalizedPost } from './payload-types.js'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
diff --git a/test/localization/int.spec.ts b/test/localization/int.spec.ts
index bf55cc5654..32bb9380d4 100644
--- a/test/localization/int.spec.ts
+++ b/test/localization/int.spec.ts
@@ -1,9 +1,11 @@
-import type { Payload } from '../../packages/payload/src/index.js'
-import type { Where } from '../../packages/payload/src/types/index.js'
+import type { Payload } from 'payload'
+import type { Where } from 'payload/types'
+
+import { getPayload } from 'payload'
+
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 import type { LocalizedPost, WithLocalizedRelationship } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
 import { englishLocale } from '../globals/config.js'
 import { idToString } from '../helpers/idToString.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
@@ -288,8 +290,8 @@ describe('Localization', () => {
         const post = await payload.create({
           collection: localizedSortSlug,
           data: {
-            title: `EN ${i}`,
             date: new Date(),
+            title: `EN ${i}`,
           },
           locale: englishLocale,
         })
@@ -298,8 +300,8 @@ describe('Localization', () => {
           id: post.id,
           collection: localizedSortSlug,
           data: {
-            title: `ES ${i}`,
             date: new Date(),
+            title: `ES ${i}`,
           },
           locale: spanishLocale,
         })
@@ -629,11 +631,11 @@ describe('Localization', () => {
       const reversedArrayRows = [...globalArray.array].reverse()
 
       const updatedGlobal = await payload.updateGlobal({
+        slug: 'global-array',
         data: {
           array: reversedArrayRows,
         },
         locale: 'all',
-        slug: 'global-array',
       })
 
       expect(updatedGlobal.array[0].text.en).toStrictEqual('test en 2')
@@ -736,10 +738,10 @@ describe('Localization', () => {
       const { data } = await restClient
         .GRAPHQL_POST({
           body: JSON.stringify({ query }),
-          query: { locale: 'en' },
           headers: {
             Authorization: `JWT ${token}`,
           },
+          query: { locale: 'en' },
         })
         .then((res) => res.json())
       const result = data.meUser
@@ -763,10 +765,10 @@ describe('Localization', () => {
       const { data } = await restClient
         .GRAPHQL_POST({
           body: JSON.stringify({ query: create }),
-          query: { locale: 'en' },
           headers: {
             Authorization: `JWT ${token}`,
           },
+          query: { locale: 'en' },
         })
         .then((res) => res.json())
       const createResult = data.createLocalizedPost
@@ -786,10 +788,10 @@ describe('Localization', () => {
       const { data: updateData } = await restClient
         .GRAPHQL_POST({
           body: JSON.stringify({ query: update }),
-          query: { locale: 'en' },
           headers: {
             Authorization: `JWT ${token}`,
           },
+          query: { locale: 'en' },
         })
         .then((res) => res.json())
       const updateResult = updateData.updateLocalizedPost
@@ -835,10 +837,10 @@ describe('Localization', () => {
       const { data: multipleLocaleData } = await restClient
         .GRAPHQL_POST({
           body: JSON.stringify({ query }),
-          query: { locale: 'en' },
           headers: {
             Authorization: `JWT ${token}`,
           },
+          query: { locale: 'en' },
         })
         .then((res) => res.json())
 
@@ -962,44 +964,44 @@ describe('Localization', () => {
     it('should be equal to the created document', async () => {
       const { id, blocks } = await payload.create({
         collection: nestedToArrayAndBlockCollectionSlug,
-        locale: defaultLocale,
         data: {
           blocks: [
             {
-              blockType: 'block',
               array: [
                 {
                   text: 'english',
                   textNotLocalized: 'test',
                 },
               ],
+              blockType: 'block',
             },
           ],
         },
+        locale: defaultLocale,
       })
 
       await payload.update({
-        collection: nestedToArrayAndBlockCollectionSlug,
-        locale: spanishLocale,
         id,
+        collection: nestedToArrayAndBlockCollectionSlug,
         data: {
           blocks: (blocks as { array: { text: string }[] }[]).map((block) => ({
             ...block,
             array: block.array.map((item) => ({ ...item, text: 'spanish' })),
           })),
         },
+        locale: spanishLocale,
       })
 
       const docDefaultLocale = await payload.findByID({
+        id,
         collection: nestedToArrayAndBlockCollectionSlug,
         locale: defaultLocale,
-        id,
       })
 
       const docSpanishLocale = await payload.findByID({
+        id,
         collection: nestedToArrayAndBlockCollectionSlug,
         locale: spanishLocale,
-        id,
       })
 
       const rowDefault = docDefaultLocale.blocks[0].array[0]
diff --git a/test/package.json b/test/package.json
new file mode 100644
index 0000000000..30de348373
--- /dev/null
+++ b/test/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "test",
+  "version": "0.0.1",
+  "description": "Payload test suite",
+  "private": true,
+  "scripts": {
+    "dev": "pnpm -C \"../\" run dev",
+    "test": "pnpm -C \"../\" run test",
+    "test:e2e": "pnpm -C \"../\" run test:e2e",
+    "test:int": "pnpm -C \"../\" run test:int",
+    "typecheck": "tsc --project tsconfig.typecheck.json"
+  },
+  "type": "module",
+  "devDependencies": {
+    "@payloadcms/db-mongodb": "workspace:*",
+    "@payloadcms/db-postgres": "workspace:*",
+    "@payloadcms/eslint-config": "workspace:*",
+    "@payloadcms/graphql": "workspace:*",
+    "@payloadcms/live-preview": "workspace:*",
+    "@payloadcms/live-preview-react": "workspace:*",
+    "@payloadcms/next": "workspace:*",
+    "@payloadcms/plugin-cloud": "workspace:*",
+    "@payloadcms/plugin-cloud-storage": "workspace:*",
+    "@payloadcms/plugin-form-builder": "workspace:*",
+    "@payloadcms/plugin-nested-docs": "workspace:*",
+    "@payloadcms/plugin-redirects": "workspace:*",
+    "@payloadcms/plugin-search": "workspace:*",
+    "@payloadcms/plugin-sentry": "workspace:*",
+    "@payloadcms/plugin-seo": "workspace:*",
+    "@payloadcms/plugin-stripe": "workspace:*",
+    "@payloadcms/richtext-lexical": "workspace:*",
+    "@payloadcms/richtext-slate": "workspace:*",
+    "@payloadcms/translations": "workspace:*",
+    "@payloadcms/ui": "workspace:*",
+    "create-payload-app": "workspace:*",
+    "payload": "workspace:*"
+  }
+}
diff --git a/test/plugin-cloud-storage/collections/Media.ts b/test/plugin-cloud-storage/collections/Media.ts
index b301c4f470..4762fe3a7c 100644
--- a/test/plugin-cloud-storage/collections/Media.ts
+++ b/test/plugin-cloud-storage/collections/Media.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Media: CollectionConfig = {
   slug: 'media',
diff --git a/test/plugin-cloud-storage/collections/Users.ts b/test/plugin-cloud-storage/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-cloud-storage/collections/Users.ts
+++ b/test/plugin-cloud-storage/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-cloud-storage/config.ts b/test/plugin-cloud-storage/config.ts
index 3bdeab3ee6..e43106efb1 100644
--- a/test/plugin-cloud-storage/config.ts
+++ b/test/plugin-cloud-storage/config.ts
@@ -1,12 +1,12 @@
+import type { Adapter } from '@payloadcms/plugin-cloud-storage/types'
+
+import { cloudStorage } from '@payloadcms/plugin-cloud-storage'
 import dotenv from 'dotenv'
 import path from 'path'
 
-import type { Adapter } from '../../packages/plugin-cloud-storage/src/types.js'
-
 import { azureBlobStorageAdapter } from '../../packages/plugin-cloud-storage/src/adapters/azure/index.js'
 import { gcsAdapter } from '../../packages/plugin-cloud-storage/src/adapters/gcs/index.js'
 import { s3Adapter } from '../../packages/plugin-cloud-storage/src/adapters/s3/index.js'
-import { cloudStorage } from '../../packages/plugin-cloud-storage/src/index.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Media } from './collections/Media.js'
@@ -25,10 +25,10 @@ console.log(
 
 if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'azure') {
   adapter = azureBlobStorageAdapter({
-    connectionString: process.env.AZURE_STORAGE_CONNECTION_STRING,
-    containerName: process.env.AZURE_STORAGE_CONTAINER_NAME,
     allowContainerCreate: process.env.AZURE_STORAGE_ALLOW_CONTAINER_CREATE === 'true',
     baseURL: process.env.AZURE_STORAGE_ACCOUNT_BASEURL,
+    connectionString: process.env.AZURE_STORAGE_CONNECTION_STRING,
+    containerName: process.env.AZURE_STORAGE_CONTAINER_NAME,
   })
   // uploadOptions = {
   //   useTempFiles: true,
@@ -37,11 +37,11 @@ if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'azure') {
 
 if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'gcs') {
   adapter = gcsAdapter({
+    bucket: process.env.GCS_BUCKET,
     options: {
       apiEndpoint: process.env.GCS_ENDPOINT,
       projectId: process.env.GCS_PROJECT_ID,
     },
-    bucket: process.env.GCS_BUCKET,
   })
 }
 
@@ -55,46 +55,36 @@ if (
   }
 
   adapter = s3Adapter({
+    bucket: process.env.S3_BUCKET,
     config: {
-      endpoint: process.env.S3_ENDPOINT,
-      forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
-      region: process.env.S3_REGION,
       credentials: {
         accessKeyId: process.env.S3_ACCESS_KEY_ID,
         secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
       },
+      endpoint: process.env.S3_ENDPOINT,
+      forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
+      region: process.env.S3_REGION,
     },
-    bucket: process.env.S3_BUCKET,
   })
 }
 
 if (process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER === 'r2') {
   adapter = s3Adapter({
+    bucket: process.env.R2_BUCKET,
     config: {
-      endpoint: process.env.R2_ENDPOINT,
-      forcePathStyle: process.env.R2_FORCE_PATH_STYLE === 'true',
-      region: process.env.R2_REGION,
       credentials: {
         accessKeyId: process.env.R2_ACCESS_KEY_ID,
         secretAccessKey: process.env.R2_SECRET_ACCESS_KEY,
       },
+      endpoint: process.env.R2_ENDPOINT,
+      forcePathStyle: process.env.R2_FORCE_PATH_STYLE === 'true',
+      region: process.env.R2_REGION,
     },
-    bucket: process.env.R2_BUCKET,
   })
 }
 
 export default buildConfigWithDefaults({
   collections: [Media, Users],
-  upload: uploadOptions,
-  plugins: [
-    cloudStorage({
-      collections: {
-        media: {
-          adapter,
-        },
-      },
-    }),
-  ],
   onInit: async (payload) => {
     /*const client = new AWS.S3({
       endpoint: process.env.S3_ENDPOINT,
@@ -122,4 +112,14 @@ export default buildConfigWithDefaults({
       },
     })
   },
+  plugins: [
+    cloudStorage({
+      collections: {
+        media: {
+          adapter,
+        },
+      },
+    }),
+  ],
+  upload: uploadOptions,
 })
diff --git a/test/plugin-cloud-storage/int.spec.ts b/test/plugin-cloud-storage/int.spec.ts
index 14f2b1a101..88ebad14eb 100644
--- a/test/plugin-cloud-storage/int.spec.ts
+++ b/test/plugin-cloud-storage/int.spec.ts
@@ -2,7 +2,7 @@ import * as AWS from '@aws-sdk/client-s3'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { describeIfInCIOrHasLocalstack } from '../helpers.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/plugin-cloud/collections/Media.ts b/test/plugin-cloud/collections/Media.ts
index ee408a22f6..c534a4c6bc 100644
--- a/test/plugin-cloud/collections/Media.ts
+++ b/test/plugin-cloud/collections/Media.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Media: CollectionConfig = {
   slug: 'media',
diff --git a/test/plugin-cloud/collections/Users.ts b/test/plugin-cloud/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-cloud/collections/Users.ts
+++ b/test/plugin-cloud/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-cloud/config.ts b/test/plugin-cloud/config.ts
index 62cad019d5..e5e34d1c3f 100644
--- a/test/plugin-cloud/config.ts
+++ b/test/plugin-cloud/config.ts
@@ -1,7 +1,7 @@
+import { payloadCloud } from '@payloadcms/plugin-cloud'
 import dotenv from 'dotenv'
 import path from 'path'
 
-import { payloadCloud } from '../../packages/plugin-cloud/src/index.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Media } from './collections/Media.js'
@@ -14,8 +14,6 @@ dotenv.config({
 
 export default buildConfigWithDefaults({
   collections: [Media, Users],
-  serverURL: process.env.PAYLOAD_PUBLIC_SERVER_URL,
-  plugins: [payloadCloud()],
   onInit: async (payload) => {
     await payload.create({
       collection: 'users',
@@ -25,4 +23,6 @@ export default buildConfigWithDefaults({
       },
     })
   },
+  plugins: [payloadCloud()],
+  serverURL: process.env.PAYLOAD_PUBLIC_SERVER_URL,
 })
diff --git a/test/plugin-cloud/int.spec.ts b/test/plugin-cloud/int.spec.ts
index a750d45cf4..f04d3e63db 100644
--- a/test/plugin-cloud/int.spec.ts
+++ b/test/plugin-cloud/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
diff --git a/test/plugin-form-builder/collections/Pages.ts b/test/plugin-form-builder/collections/Pages.ts
index f69b779efa..471d0d6015 100644
--- a/test/plugin-form-builder/collections/Pages.ts
+++ b/test/plugin-form-builder/collections/Pages.ts
@@ -1,5 +1,5 @@
 // const payload = require('payload');
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Pages: CollectionConfig = {
   slug: 'pages',
diff --git a/test/plugin-form-builder/collections/Users.ts b/test/plugin-form-builder/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-form-builder/collections/Users.ts
+++ b/test/plugin-form-builder/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-form-builder/config.ts b/test/plugin-form-builder/config.ts
index e1e79ed19c..13b0a7393a 100644
--- a/test/plugin-form-builder/config.ts
+++ b/test/plugin-form-builder/config.ts
@@ -1,7 +1,8 @@
-import type { Block } from '../../packages/payload/src/fields/config/types.js'
+import type { Block } from 'payload/types'
+
+import formBuilder, { fields as formFields } from '@payloadcms/plugin-form-builder'
+import { slateEditor } from '@payloadcms/richtext-slate'
 
-import formBuilder, { fields as formFields } from '../../packages/plugin-form-builder/src/index.js'
-import { slateEditor } from '../../packages/richtext-slate/src/index.js'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Pages } from './collections/Pages.js'
diff --git a/test/plugin-form-builder/int.spec.ts b/test/plugin-form-builder/int.spec.ts
index a55f303c97..a0cfedaa13 100644
--- a/test/plugin-form-builder/int.spec.ts
+++ b/test/plugin-form-builder/int.spec.ts
@@ -1,7 +1,9 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
+import { ValidationError } from 'payload/errors'
+
 import type { Form } from './payload-types.js'
 
-import { ValidationError } from '../../packages/payload/src/errors/index.js'
 import { serializeLexical } from '../../packages/plugin-form-builder/src/utilities/lexical/serializeLexical.js'
 import { serializeSlate } from '../../packages/plugin-form-builder/src/utilities/slate/serializeSlate.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/plugin-form-builder/seed/index.ts b/test/plugin-form-builder/seed/index.ts
index 8e4098817f..c15d309c47 100644
--- a/test/plugin-form-builder/seed/index.ts
+++ b/test/plugin-form-builder/seed/index.ts
@@ -1,5 +1,5 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
-import type { PayloadRequest } from '../../../packages/payload/src/types/index.js'
+import type { Payload } from 'payload'
+import type { PayloadRequest } from 'payload/types'
 
 import { formSubmissionsSlug, formsSlug, pagesSlug } from '../shared.js'
 
@@ -29,7 +29,6 @@ export const seed = async (payload: Payload): Promise<boolean> => {
     const { id: formID } = await payload.create({
       collection: formsSlug,
       data: {
-        title: 'Contact Form',
         confirmationMessage: [
           {
             type: 'paragraph',
@@ -38,18 +37,19 @@ export const seed = async (payload: Payload): Promise<boolean> => {
         ],
         fields: [
           {
+            name: 'name',
             blockType: 'text',
             label: 'Name',
-            name: 'name',
             required: true,
           },
           {
+            name: 'email',
             blockType: 'email',
             label: 'Email',
-            name: 'email',
             required: true,
           },
         ],
+        title: 'Contact Form',
       },
     })
 
@@ -73,9 +73,9 @@ export const seed = async (payload: Payload): Promise<boolean> => {
     await payload.create({
       collection: pagesSlug,
       data: {
-        title: 'Contact',
         slug: 'contact',
         form: formID,
+        title: 'Contact',
       },
     })
 
diff --git a/test/plugin-nested-docs/collections/Categories.ts b/test/plugin-nested-docs/collections/Categories.ts
index 3f5a8cd0cc..a0c3fafe1c 100644
--- a/test/plugin-nested-docs/collections/Categories.ts
+++ b/test/plugin-nested-docs/collections/Categories.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { createBreadcrumbsField } from '../../../packages/plugin-nested-docs/src/fields/breadcrumbs.js'
 import createParentField from '../../../packages/plugin-nested-docs/src/fields/parent.js'
diff --git a/test/plugin-nested-docs/collections/Pages.ts b/test/plugin-nested-docs/collections/Pages.ts
index 89a04d4c91..ec458b7394 100644
--- a/test/plugin-nested-docs/collections/Pages.ts
+++ b/test/plugin-nested-docs/collections/Pages.ts
@@ -1,5 +1,5 @@
 // const payload = require('payload');
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import populateFullTitle from './populateFullTitle.js'
 
diff --git a/test/plugin-nested-docs/collections/Users.ts b/test/plugin-nested-docs/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-nested-docs/collections/Users.ts
+++ b/test/plugin-nested-docs/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-nested-docs/collections/populateFullTitle.ts b/test/plugin-nested-docs/collections/populateFullTitle.ts
index 825609d0db..f462222d0f 100644
--- a/test/plugin-nested-docs/collections/populateFullTitle.ts
+++ b/test/plugin-nested-docs/collections/populateFullTitle.ts
@@ -1,4 +1,4 @@
-import type { FieldHook } from '../../../packages/payload/src/fields/config/types.js'
+import type { FieldHook } from 'payload/types'
 
 export const generateFullTitle = (breadcrumbs: Array<{ label: string }>): string | undefined => {
   if (Array.isArray(breadcrumbs)) {
@@ -11,7 +11,7 @@ export const generateFullTitle = (breadcrumbs: Array<{ label: string }>): string
   return undefined
 }
 
-const populateFullTitle: FieldHook = async ({ data, originalDoc }) =>
+const populateFullTitle: FieldHook = ({ data, originalDoc }) =>
   generateFullTitle(data?.breadcrumbs || originalDoc?.breadcrumbs)
 
 export default populateFullTitle
diff --git a/test/plugin-nested-docs/config.ts b/test/plugin-nested-docs/config.ts
index 88e14cc13f..d024756ed3 100644
--- a/test/plugin-nested-docs/config.ts
+++ b/test/plugin-nested-docs/config.ts
@@ -1,4 +1,5 @@
-import nestedDocs from '../../packages/plugin-nested-docs/src/index.js'
+import nestedDocs from '@payloadcms/plugin-nested-docs'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Categories } from './collections/Categories.js'
diff --git a/test/plugin-nested-docs/e2e.spec.ts b/test/plugin-nested-docs/e2e.spec.ts
index 8a947b2b78..890c9cef86 100644
--- a/test/plugin-nested-docs/e2e.spec.ts
+++ b/test/plugin-nested-docs/e2e.spec.ts
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'url'
 
 import type { Page as PayloadPage } from './payload-types.js'
 
-import payload from '../../packages/payload/src/index.js'
+import payload from 'payload'
 import { initPageConsoleErrorCatch } from '../helpers.js'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
 import { initPayloadE2E } from '../helpers/initPayloadE2E.js'
diff --git a/test/plugin-nested-docs/int.spec.ts b/test/plugin-nested-docs/int.spec.ts
index a836cd951d..70ce703304 100644
--- a/test/plugin-nested-docs/int.spec.ts
+++ b/test/plugin-nested-docs/int.spec.ts
@@ -1,8 +1,5 @@
-import type {
-  ArrayField,
-  RelationshipField,
-} from '../../packages/payload/src/fields/config/types.js'
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+import type { ArrayField, RelationshipField } from 'payload/types'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
diff --git a/test/plugin-nested-docs/seed/index.ts b/test/plugin-nested-docs/seed/index.ts
index b5ee1de81d..bdb800fd6b 100644
--- a/test/plugin-nested-docs/seed/index.ts
+++ b/test/plugin-nested-docs/seed/index.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 export const seed = async (payload: Payload): Promise<boolean> => {
   payload.logger.info('Seeding data...')
diff --git a/test/plugin-redirects/collections/Pages.ts b/test/plugin-redirects/collections/Pages.ts
index cd070a70db..2242e00379 100644
--- a/test/plugin-redirects/collections/Pages.ts
+++ b/test/plugin-redirects/collections/Pages.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { pagesSlug } from '../shared.js'
 
diff --git a/test/plugin-redirects/collections/Users.ts b/test/plugin-redirects/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-redirects/collections/Users.ts
+++ b/test/plugin-redirects/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-redirects/config.ts b/test/plugin-redirects/config.ts
index 7ea1eb3953..06e8b9055c 100644
--- a/test/plugin-redirects/config.ts
+++ b/test/plugin-redirects/config.ts
@@ -1,4 +1,5 @@
-import redirectsPlugin from '../../packages/plugin-redirects/src/index.js'
+import { redirects } from '@payloadcms/plugin-redirects'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Pages } from './collections/Pages.js'
@@ -24,7 +25,7 @@ export default buildConfigWithDefaults({
     await seed(payload)
   },
   plugins: [
-    redirectsPlugin({
+    redirects({
       collections: ['pages'],
     }),
   ],
diff --git a/test/plugin-redirects/int.spec.ts b/test/plugin-redirects/int.spec.ts
index 4f294daee4..5020590325 100644
--- a/test/plugin-redirects/int.spec.ts
+++ b/test/plugin-redirects/int.spec.ts
@@ -1,4 +1,5 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
+
 import type { Page } from './payload-types.js'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/plugin-redirects/seed/index.ts b/test/plugin-redirects/seed/index.ts
index 54264386bc..dbef0454be 100644
--- a/test/plugin-redirects/seed/index.ts
+++ b/test/plugin-redirects/seed/index.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { PayloadRequest } from '../../../packages/payload/types.js'
 
 export const seed = async (payload: Payload): Promise<boolean> => {
diff --git a/test/plugin-search/collections/Pages.ts b/test/plugin-search/collections/Pages.ts
index cd070a70db..2242e00379 100644
--- a/test/plugin-search/collections/Pages.ts
+++ b/test/plugin-search/collections/Pages.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { pagesSlug } from '../shared.js'
 
diff --git a/test/plugin-search/collections/Posts.ts b/test/plugin-search/collections/Posts.ts
index bee5ac4308..2f927b155b 100644
--- a/test/plugin-search/collections/Posts.ts
+++ b/test/plugin-search/collections/Posts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { postsSlug } from '../shared.js'
 
diff --git a/test/plugin-search/collections/Users.ts b/test/plugin-search/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-search/collections/Users.ts
+++ b/test/plugin-search/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-search/config.ts b/test/plugin-search/config.ts
index 6d86d5c8ac..b9be2d45a1 100644
--- a/test/plugin-search/config.ts
+++ b/test/plugin-search/config.ts
@@ -1,4 +1,5 @@
-import searchPlugin from '../../packages/plugin-search/src/index.js'
+import searchPlugin from '@payloadcms/plugin-search'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Pages } from './collections/Pages.js'
@@ -26,27 +27,27 @@ export default buildConfigWithDefaults({
   },
   plugins: [
     searchPlugin({
-      collections: ['pages', 'posts'],
-      searchOverrides: {
-        fields: [
-          {
-            name: 'excerpt',
-            label: 'Excerpt',
-            type: 'text',
-            admin: {
-              readOnly: true,
-            },
-          },
-        ],
-      },
       beforeSync: ({ originalDoc, searchDoc }) => ({
         ...searchDoc,
         excerpt: originalDoc?.excerpt || 'This is a fallback excerpt',
       }),
+      collections: ['pages', 'posts'],
       defaultPriorities: {
         pages: 10,
         posts: ({ title }) => (title === 'Hello, world!' ? 30 : 20),
       },
+      searchOverrides: {
+        fields: [
+          {
+            name: 'excerpt',
+            type: 'text',
+            admin: {
+              readOnly: true,
+            },
+            label: 'Excerpt',
+          },
+        ],
+      },
     }),
   ],
 })
diff --git a/test/plugin-search/int.spec.ts b/test/plugin-search/int.spec.ts
index 3e35441c73..0756de3b75 100644
--- a/test/plugin-search/int.spec.ts
+++ b/test/plugin-search/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/plugin-search/seed/index.ts b/test/plugin-search/seed/index.ts
index 474cced85f..5868b6b750 100644
--- a/test/plugin-search/seed/index.ts
+++ b/test/plugin-search/seed/index.ts
@@ -1,4 +1,4 @@
-import type { Payload, PayloadRequest } from '../../../packages/payload/src/types/index.js'
+import type { Payload, PayloadRequest } from 'payload/types'
 
 export const seed = async (payload: Payload): Promise<boolean> => {
   payload.logger.info('Seeding data...')
diff --git a/test/plugin-sentry/collections/Posts.ts b/test/plugin-sentry/collections/Posts.ts
index c3d73f2f7c..8797520800 100644
--- a/test/plugin-sentry/collections/Posts.ts
+++ b/test/plugin-sentry/collections/Posts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Posts: CollectionConfig = {
   slug: 'posts',
diff --git a/test/plugin-sentry/collections/Users.ts b/test/plugin-sentry/collections/Users.ts
index 81ce2ee79f..a621159274 100644
--- a/test/plugin-sentry/collections/Users.ts
+++ b/test/plugin-sentry/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-sentry/config.ts b/test/plugin-sentry/config.ts
index a02be63fae..ac00149c20 100644
--- a/test/plugin-sentry/config.ts
+++ b/test/plugin-sentry/config.ts
@@ -1,4 +1,5 @@
-import { sentry } from '../../packages/plugin-sentry/src/index.js'
+import { sentry } from '@payloadcms/plugin-sentry'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Posts } from './collections/Posts.js'
diff --git a/test/plugin-sentry/int.spec.ts b/test/plugin-sentry/int.spec.ts
index 40fc016ab4..a293289712 100644
--- a/test/plugin-sentry/int.spec.ts
+++ b/test/plugin-sentry/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
diff --git a/test/plugin-seo/collections/Media.ts b/test/plugin-seo/collections/Media.ts
index 37a22005d4..1b024b8024 100644
--- a/test/plugin-seo/collections/Media.ts
+++ b/test/plugin-seo/collections/Media.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { mediaSlug } from '../shared.js'
 const filename = fileURLToPath(import.meta.url)
diff --git a/test/plugin-seo/collections/Pages.ts b/test/plugin-seo/collections/Pages.ts
index cdb2049bd9..90ca32db1d 100644
--- a/test/plugin-seo/collections/Pages.ts
+++ b/test/plugin-seo/collections/Pages.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { pagesSlug } from '../shared.js'
 
diff --git a/test/plugin-seo/collections/Users.ts b/test/plugin-seo/collections/Users.ts
index 78bf8e9b27..3e7610d204 100644
--- a/test/plugin-seo/collections/Users.ts
+++ b/test/plugin-seo/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-seo/config.ts b/test/plugin-seo/config.ts
index fa5063db0c..78ff8259e7 100644
--- a/test/plugin-seo/config.ts
+++ b/test/plugin-seo/config.ts
@@ -1,4 +1,5 @@
-import { seo } from '../../packages/plugin-seo/src/index.js'
+import { seo } from '@payloadcms/plugin-seo'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Media } from './collections/Media.js'
diff --git a/test/plugin-seo/e2e.spec.ts b/test/plugin-seo/e2e.spec.ts
index c053d49921..5e77ffafc8 100644
--- a/test/plugin-seo/e2e.spec.ts
+++ b/test/plugin-seo/e2e.spec.ts
@@ -1,10 +1,10 @@
 import type { Page } from '@playwright/test'
+import type { Payload } from 'payload/types'
 
 import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/types/index.js'
 import type { Page as PayloadPage } from './payload-types.js'
 
 import getFileByPath from '../../packages/payload/src/uploads/getFileByPath.js'
diff --git a/test/plugin-seo/int.spec.ts b/test/plugin-seo/int.spec.ts
index 6a4ce548ac..884af8c3d0 100644
--- a/test/plugin-seo/int.spec.ts
+++ b/test/plugin-seo/int.spec.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import getFileByPath from '../../packages/payload/src/uploads/getFileByPath.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
diff --git a/test/plugin-seo/seed/index.ts b/test/plugin-seo/seed/index.ts
index 426d592440..5a1d279f85 100644
--- a/test/plugin-seo/seed/index.ts
+++ b/test/plugin-seo/seed/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { Payload, PayloadRequest } from '../../../packages/payload/src/index.js'
+import type { Payload, PayloadRequest } from 'payload'
 
 import getFileByPath from '../../../packages/payload/src/uploads/getFileByPath.js'
 import { mediaSlug } from '../shared.js'
diff --git a/test/plugin-stripe/collections/Customers.ts b/test/plugin-stripe/collections/Customers.ts
index 529d57b9b6..c8fe704008 100644
--- a/test/plugin-stripe/collections/Customers.ts
+++ b/test/plugin-stripe/collections/Customers.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { LinkToDoc } from '../../../packages/plugin-stripe/src/ui/LinkToDoc.js'
 import { customersSlug } from '../shared.js'
diff --git a/test/plugin-stripe/collections/Products.ts b/test/plugin-stripe/collections/Products.ts
index 4bbce06b12..d1133a8eba 100644
--- a/test/plugin-stripe/collections/Products.ts
+++ b/test/plugin-stripe/collections/Products.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { productsSlug } from '../shared.js'
 
diff --git a/test/plugin-stripe/collections/Users.ts b/test/plugin-stripe/collections/Users.ts
index 32bb8f7cc0..f95c2be184 100644
--- a/test/plugin-stripe/collections/Users.ts
+++ b/test/plugin-stripe/collections/Users.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Users: CollectionConfig = {
   slug: 'users',
diff --git a/test/plugin-stripe/config.ts b/test/plugin-stripe/config.ts
index 69164eb567..3a3437009c 100644
--- a/test/plugin-stripe/config.ts
+++ b/test/plugin-stripe/config.ts
@@ -1,4 +1,5 @@
-import stripePlugin from '../../packages/plugin-stripe/src/index.js'
+import stripePlugin from '@payloadcms/plugin-stripe'
+
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Customers } from './collections/Customers.js'
diff --git a/test/plugin-stripe/int.spec.ts b/test/plugin-stripe/int.spec.ts
index 4b733738fc..82e3604bc6 100644
--- a/test/plugin-stripe/int.spec.ts
+++ b/test/plugin-stripe/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise from './config.js'
diff --git a/test/plugin-stripe/seed/index.ts b/test/plugin-stripe/seed/index.ts
index 474cced85f..5868b6b750 100644
--- a/test/plugin-stripe/seed/index.ts
+++ b/test/plugin-stripe/seed/index.ts
@@ -1,4 +1,4 @@
-import type { Payload, PayloadRequest } from '../../../packages/payload/src/types/index.js'
+import type { Payload, PayloadRequest } from 'payload/types'
 
 export const seed = async (payload: Payload): Promise<boolean> => {
   payload.logger.info('Seeding data...')
diff --git a/test/plugin-stripe/webhooks/subscriptionCreatedOrUpdated.ts b/test/plugin-stripe/webhooks/subscriptionCreatedOrUpdated.ts
index c42d296637..85a9a808ba 100644
--- a/test/plugin-stripe/webhooks/subscriptionCreatedOrUpdated.ts
+++ b/test/plugin-stripe/webhooks/subscriptionCreatedOrUpdated.ts
@@ -1,4 +1,4 @@
-import { APIError } from '../../../packages/payload/src/errors/index.js'
+import { APIError } from 'payload/errors'
 
 export const subscriptionCreatedOrUpdated = async (args) => {
   const {
diff --git a/test/plugin-stripe/webhooks/subscriptionDeleted.ts b/test/plugin-stripe/webhooks/subscriptionDeleted.ts
index c3a40983b5..3624761622 100644
--- a/test/plugin-stripe/webhooks/subscriptionDeleted.ts
+++ b/test/plugin-stripe/webhooks/subscriptionDeleted.ts
@@ -1,4 +1,4 @@
-import { APIError } from '../../../packages/payload/src/errors/index.js'
+import { APIError } from 'payload/errors'
 
 export const subscriptionDeleted = async (args) => {
   const {
diff --git a/test/plugins/int.spec.ts b/test/plugins/int.spec.ts
index 7f0deddcc9..637fe37ab8 100644
--- a/test/plugins/int.spec.ts
+++ b/test/plugins/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import configPromise, { pagesSlug } from './config.js'
diff --git a/test/refresh-permissions/GlobalViewWithRefresh.tsx b/test/refresh-permissions/GlobalViewWithRefresh.tsx
index 57915d8a5b..08041aaa66 100644
--- a/test/refresh-permissions/GlobalViewWithRefresh.tsx
+++ b/test/refresh-permissions/GlobalViewWithRefresh.tsx
@@ -1,17 +1,17 @@
+import type { EditViewProps } from 'payload/types'
+
+import { useAuth } from '@payloadcms/ui'
 import React, { useCallback } from 'react'
 
-import type { EditViewProps as Props } from '../../packages/payload/src/admin/views/types.js'
-
 import { EditView as DefaultEditView } from '../../packages/next/src/views/Edit/index.js'
-import { useAuth } from '../../packages/ui/src/providers/Auth/index.js'
 
-const GlobalView: React.FC<Props> = (props) => {
+const GlobalView: React.FC<EditViewProps> = (props) => {
   const { onSave } = props
   const { refreshPermissions } = useAuth()
   const modifiedOnSave = useCallback(
     (...args) => {
       onSave.call(null, ...args)
-      refreshPermissions()
+      void refreshPermissions()
     },
     [onSave, refreshPermissions],
   )
diff --git a/test/relationships/config.ts b/test/relationships/config.ts
index 8bdda42a04..6b5cf083a4 100644
--- a/test/relationships/config.ts
+++ b/test/relationships/config.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
diff --git a/test/relationships/int.spec.ts b/test/relationships/int.spec.ts
index c1a84d02c6..7e45eac6a7 100644
--- a/test/relationships/int.spec.ts
+++ b/test/relationships/int.spec.ts
@@ -1,6 +1,7 @@
+import type { Payload } from 'payload'
+
 import { randomBytes } from 'crypto'
 
-import type { Payload } from '../../packages/payload/src/index.js'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 import type {
   ChainedRelation,
diff --git a/test/startMemoryDB.ts b/test/startMemoryDB.ts
index b84111dec2..73221d0939 100644
--- a/test/startMemoryDB.ts
+++ b/test/startMemoryDB.ts
@@ -1,8 +1,8 @@
+import type { SanitizedConfig } from 'payload/config'
+
+import { mongooseAdapter } from '@payloadcms/db-mongodb'
 import { MongoMemoryReplSet } from 'mongodb-memory-server'
 
-import type { SanitizedConfig } from '../packages/payload/src/config/types.js'
-
-import { mongooseAdapter } from '../packages/db-mongodb/src/index.js'
 import Logger from '../packages/payload/src/utilities/logger.js'
 
 export const startMemoryDB = async (
@@ -31,8 +31,8 @@ export const startMemoryDB = async (
       })
 
       config.db = mongooseAdapter({
-        url: db.getUri(),
         mongoMemoryServer: db,
+        url: db.getUri(),
       })
 
       return config
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 7d4ceddd6f..0c84f0d32d 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
-    "noEmit": false /* Do not emit outputs. */,
-    "emitDeclarationOnly": true,
+    "noEmit": true,
     "rootDir": "..", /* Specify the root folder within your source files. */
     "declaration": true,
     "declarationMap": true,
diff --git a/test/tsconfig.typecheck.json b/test/tsconfig.typecheck.json
new file mode 100644
index 0000000000..db7501ac8e
--- /dev/null
+++ b/test/tsconfig.typecheck.json
@@ -0,0 +1,41 @@
+{
+  "compilerOptions": {
+    "noEmit": true,
+    // Ideally, this should be "." once we get rid of all relative package paths
+    "rootDir": "..",
+    "declaration": true,
+    "declarationMap": true,
+    "outDir": "./just-in-case",
+    "target": "esnext",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "allowJs": true,
+    "checkJs": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "preserve",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": false,
+    "types": ["jest", "node", "@types/jest"],
+    "incremental": true,
+    "isolatedModules": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {}
+  },
+  "exclude": ["dist", "build", "node_modules", ".eslintrc.js", "dist/**/*.js", "**/dist/**/*.js"],
+  "include": [
+    // "./test/_community/**/*.ts"
+    "./**/*.ts"
+    // "/**/*.ts",
+    // "../packages/**/src/**/*.ts",
+    // "../packages/**/src/**/*.tsx"
+  ],
+  "references": []
+}
diff --git a/test/uploads/collections/Upload1/index.ts b/test/uploads/collections/Upload1/index.ts
index ba165e83ca..c51a07a470 100644
--- a/test/uploads/collections/Upload1/index.ts
+++ b/test/uploads/collections/Upload1/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Uploads1: CollectionConfig = {
   slug: 'uploads-1',
diff --git a/test/uploads/collections/Upload2/index.ts b/test/uploads/collections/Upload2/index.ts
index defb4187f2..dd7aa8cffd 100644
--- a/test/uploads/collections/Upload2/index.ts
+++ b/test/uploads/collections/Upload2/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 export const Uploads2: CollectionConfig = {
   slug: 'uploads-2',
diff --git a/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx b/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx
index 2153b84585..aea30ab971 100644
--- a/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx
+++ b/test/uploads/collections/admin-thumbnail/RegisterThumbnailFn.tsx
@@ -1,7 +1,7 @@
 'use client'
 import type React from 'react'
 
-import { useAdminThumbnail } from '../../../../packages/ui/src/hooks/useAdminThumbnail.js'
+import { useAdminThumbnail } from '@payloadcms/ui'
 
 type TypeWithFile = {
   filename: string
diff --git a/test/uploads/collections/admin-thumbnail/index.ts b/test/uploads/collections/admin-thumbnail/index.ts
index 425a276adc..bb41805d0f 100644
--- a/test/uploads/collections/admin-thumbnail/index.ts
+++ b/test/uploads/collections/admin-thumbnail/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { RegisterAdminThumbnailFn } from './RegisterThumbnailFn.js'
 
diff --git a/test/uploads/e2e.spec.ts b/test/uploads/e2e.spec.ts
index b9f23797a0..7b40ac5722 100644
--- a/test/uploads/e2e.spec.ts
+++ b/test/uploads/e2e.spec.ts
@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/types/index.js'
+import type { Payload } from 'payload/types'
 import type { Media } from './payload-types.js'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
diff --git a/test/uploads/int.spec.ts b/test/uploads/int.spec.ts
index 7caeed06c6..d3942d5d25 100644
--- a/test/uploads/int.spec.ts
+++ b/test/uploads/int.spec.ts
@@ -5,11 +5,11 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { promisify } from 'util'
 
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 import type { Enlarge, Media } from './payload-types.js'
 
-import { getPayload } from '../../packages/payload/src/index.js'
+import { getPayload } from 'payload'
 import getFileByPath from '../../packages/payload/src/uploads/getFileByPath.js'
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
 import { startMemoryDB } from '../startMemoryDB.js'
diff --git a/test/versions/collections/Autosave.ts b/test/versions/collections/Autosave.ts
index 46610ec9ce..11a76126e6 100644
--- a/test/versions/collections/Autosave.ts
+++ b/test/versions/collections/Autosave.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { autosaveCollectionSlug } from '../slugs.js'
 
diff --git a/test/versions/collections/CustomIDs.ts b/test/versions/collections/CustomIDs.ts
index 8315bd1e34..c2a3b54215 100644
--- a/test/versions/collections/CustomIDs.ts
+++ b/test/versions/collections/CustomIDs.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { customIDSlug } from '../slugs.js'
 
diff --git a/test/versions/collections/DisablePublish.ts b/test/versions/collections/DisablePublish.ts
index 4ab8d82eb8..4207f28022 100644
--- a/test/versions/collections/DisablePublish.ts
+++ b/test/versions/collections/DisablePublish.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { disablePublishSlug } from '../slugs.js'
 
diff --git a/test/versions/collections/Drafts.ts b/test/versions/collections/Drafts.ts
index 81a94c987a..6d15383114 100644
--- a/test/versions/collections/Drafts.ts
+++ b/test/versions/collections/Drafts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import CollectionVersionButton from '../elements/CollectionVersionButton/index.js'
 import CollectionVersionsButton from '../elements/CollectionVersionsButton/index.js'
diff --git a/test/versions/collections/Posts.ts b/test/versions/collections/Posts.ts
index 5444e32e1f..f3640079ea 100644
--- a/test/versions/collections/Posts.ts
+++ b/test/versions/collections/Posts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import {
   autosaveCollectionSlug,
diff --git a/test/versions/collections/Versions.ts b/test/versions/collections/Versions.ts
index 0fe006c8d9..7869ea7a29 100644
--- a/test/versions/collections/Versions.ts
+++ b/test/versions/collections/Versions.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types.js'
+import type { CollectionConfig } from 'payload/types'
 
 import { versionCollectionSlug } from '../slugs.js'
 
diff --git a/test/versions/e2e.spec.ts b/test/versions/e2e.spec.ts
index a51714bb68..0d3c5f99f5 100644
--- a/test/versions/e2e.spec.ts
+++ b/test/versions/e2e.spec.ts
@@ -29,7 +29,7 @@ import { expect, test } from '@playwright/test'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import type { Payload } from '../../packages/payload/src/types/index.js'
+import type { Payload } from 'payload/types'
 
 import wait from '../../packages/payload/src/utilities/wait.js'
 import { globalSlug } from '../admin/slugs.js'
diff --git a/test/versions/elements/CustomSaveButton/index.tsx b/test/versions/elements/CustomSaveButton/index.tsx
index 5f1db7f06b..0f5e3cfe48 100644
--- a/test/versions/elements/CustomSaveButton/index.tsx
+++ b/test/versions/elements/CustomSaveButton/index.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 // In your projects, you can import as follows:
 // import { CustomPublishButtonProps } from 'payload/types';
 
-import type { CustomPublishButtonProps } from '../../../../packages/payload/src/admin/elements/PublishButton.js'
+import type { CustomPublishButtonProps } from 'payload/types'
 
 import classes from './index.module.scss'
 
diff --git a/test/versions/globals/Autosave.ts b/test/versions/globals/Autosave.ts
index 91798e0a1a..2a079e42de 100644
--- a/test/versions/globals/Autosave.ts
+++ b/test/versions/globals/Autosave.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { autoSaveGlobalSlug } from '../slugs.js'
 
diff --git a/test/versions/globals/DisablePublish.ts b/test/versions/globals/DisablePublish.ts
index c0f90ef4a1..fc0dc7e16f 100644
--- a/test/versions/globals/DisablePublish.ts
+++ b/test/versions/globals/DisablePublish.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import { disablePublishGlobalSlug } from '../slugs.js'
 
diff --git a/test/versions/globals/Draft.ts b/test/versions/globals/Draft.ts
index ac9224861f..59142dedcb 100644
--- a/test/versions/globals/Draft.ts
+++ b/test/versions/globals/Draft.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types.js'
+import type { GlobalConfig } from 'payload/types'
 
 import GlobalVersionButton from '../elements/GlobalVersionButton/index.js'
 import GlobalVersionsButton from '../elements/GlobalVersionsButton/index.js'
diff --git a/test/versions/int.spec.ts b/test/versions/int.spec.ts
index 9af1ffd030..cb9693fbd4 100644
--- a/test/versions/int.spec.ts
+++ b/test/versions/int.spec.ts
@@ -1,4 +1,4 @@
-import type { Payload } from '../../packages/payload/src/index.js'
+import type { Payload } from 'payload'
 import type { NextRESTClient } from '../helpers/NextRESTClient.js'
 
 import { devUser } from '../credentials.js'
diff --git a/test/versions/seed.ts b/test/versions/seed.ts
index b28e472d27..5bc5c7fee4 100644
--- a/test/versions/seed.ts
+++ b/test/versions/seed.ts
@@ -1,4 +1,4 @@
-import { type Payload } from '../../packages/payload/src/index.js'
+import { type Payload } from 'payload'
 import { devUser } from '../credentials.js'
 import { seedDB } from '../helpers/seed.js'
 import { titleToDelete } from './shared.js'