diff --git a/nodemon.json b/nodemon.json
index f7e53e057..2f7903bdb 100644
--- a/nodemon.json
+++ b/nodemon.json
@@ -4,7 +4,8 @@
     "node_modules",
     "node_modules/**/node_modules",
     "src/admin",
-    "src/**/*.spec.ts"
+    "src/**/*.spec.ts",
+    "test/**/payload-types.ts"
   ],
   "watch": [
     "src/**/*.ts",
diff --git a/package.json b/package.json
index 50c0e8a02..cf0febba9 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "demo:generate:graphqlschema": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.ts node dist/bin/generateGraphQLSchema",
     "demo:serve": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.ts NODE_ENV=production nodemon",
     "dev": "nodemon",
+    "dev:generatetypes": "node ./test/dev/generateTypes.js",
     "test": "yarn test:int && yarn test:components",
     "test:int": "cross-env NODE_ENV=test DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
     "test:e2e": "cross-env NODE_ENV=test DISABLE_LOGGING=true playwright test",
diff --git a/playwright.config.ts b/playwright.config.ts
index ec3ca50a8..75010eb3f 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -5,5 +5,6 @@ const config: PlaywrightTestConfig = {
   // Look for test files in the "tests" directory, relative to this configuration file
   testDir: 'test/e2e',
   workers: 999,
+  timeout: 600000,
 };
 export default config;
diff --git a/src/admin/components/elements/Button/index.tsx b/src/admin/components/elements/Button/index.tsx
index 2552aa342..4ddfc5faa 100644
--- a/src/admin/components/elements/Button/index.tsx
+++ b/src/admin/components/elements/Button/index.tsx
@@ -25,7 +25,9 @@ const ButtonContents = ({ children, icon, tooltip }) => {
   const BuiltInIcon = icons[icon];
 
   return (
-    <span className={`${baseClass}__content`}>
+    <span
+      className={`${baseClass}__content`}
+    >
       {tooltip && (
         <Tooltip className={`${baseClass}__tooltip`}>
           {tooltip}
@@ -49,6 +51,7 @@ const ButtonContents = ({ children, icon, tooltip }) => {
 const Button: React.FC<Props> = (props) => {
   const {
     className,
+    id,
     type = 'button',
     el,
     to,
@@ -86,6 +89,7 @@ const Button: React.FC<Props> = (props) => {
   }
 
   const buttonProps = {
+    id,
     type,
     className: classes,
     disabled,
diff --git a/src/admin/components/elements/Button/types.ts b/src/admin/components/elements/Button/types.ts
index 3512c5c84..2cdadc7e7 100644
--- a/src/admin/components/elements/Button/types.ts
+++ b/src/admin/components/elements/Button/types.ts
@@ -2,6 +2,7 @@ import React, { MouseEvent } from 'react';
 
 export type Props = {
   className?: string,
+  id?: string,
   type?: 'submit' | 'button',
   el?: 'link' | 'anchor' | undefined,
   to?: string,
@@ -12,6 +13,7 @@ export type Props = {
   icon?: React.ReactNode | ['chevron' | 'x' | 'plus' | 'edit'],
   iconStyle?: 'with-border' | 'without-border' | 'none',
   buttonStyle?: 'primary' | 'secondary' | 'transparent' | 'error' | 'none' | 'icon-label',
+  buttonId?: string,
   round?: boolean,
   size?: 'small' | 'medium',
   iconPosition?: 'left' | 'right',
diff --git a/src/admin/components/elements/Card/index.tsx b/src/admin/components/elements/Card/index.tsx
index ae30db123..697ecbaed 100644
--- a/src/admin/components/elements/Card/index.tsx
+++ b/src/admin/components/elements/Card/index.tsx
@@ -7,15 +7,19 @@ import './index.scss';
 const baseClass = 'card';
 
 const Card: React.FC<Props> = (props) => {
-  const { title, actions, onClick } = props;
+  const { id, title, actions, onClick } = props;
 
   const classes = [
     baseClass,
+    id,
     onClick && `${baseClass}--has-onclick`,
   ].filter(Boolean).join(' ');
 
   return (
-    <div className={classes}>
+    <div
+      className={classes}
+      id={id}
+    >
       <h5>
         {title}
       </h5>
diff --git a/src/admin/components/elements/Card/types.ts b/src/admin/components/elements/Card/types.ts
index 016254b24..505a9fbe7 100644
--- a/src/admin/components/elements/Card/types.ts
+++ b/src/admin/components/elements/Card/types.ts
@@ -1,4 +1,5 @@
 export type Props = {
+  id?: string,
   title: string,
   actions?: React.ReactNode,
   onClick?: () => void,
diff --git a/src/admin/components/elements/DeleteDocument/index.tsx b/src/admin/components/elements/DeleteDocument/index.tsx
index 1f32cca29..f9873eb9c 100644
--- a/src/admin/components/elements/DeleteDocument/index.tsx
+++ b/src/admin/components/elements/DeleteDocument/index.tsx
@@ -18,6 +18,7 @@ const DeleteDocument: React.FC<Props> = (props) => {
   const {
     title: titleFromProps,
     id,
+    buttonId,
     collection: {
       admin: {
         useAsTitle,
@@ -78,6 +79,7 @@ const DeleteDocument: React.FC<Props> = (props) => {
       <React.Fragment>
         <button
           type="button"
+          id={buttonId}
           className={`${baseClass}__toggle`}
           onClick={(e) => {
             e.preventDefault();
@@ -105,6 +107,7 @@ const DeleteDocument: React.FC<Props> = (props) => {
               &quot;. Are you sure?
             </p>
             <Button
+              id="confirm-cancel"
               buttonStyle="secondary"
               type="button"
               onClick={deleting ? undefined : () => toggle(modalSlug)}
@@ -113,6 +116,7 @@ const DeleteDocument: React.FC<Props> = (props) => {
             </Button>
             <Button
               onClick={deleting ? undefined : handleDelete}
+              id="confirm-delete"
             >
               {deleting ? 'Deleting...' : 'Confirm'}
             </Button>
diff --git a/src/admin/components/elements/DeleteDocument/types.ts b/src/admin/components/elements/DeleteDocument/types.ts
index 5c353a5d2..40266d3c6 100644
--- a/src/admin/components/elements/DeleteDocument/types.ts
+++ b/src/admin/components/elements/DeleteDocument/types.ts
@@ -3,5 +3,6 @@ import { SanitizedCollectionConfig } from '../../../../collections/config/types'
 export type Props = {
   collection?: SanitizedCollectionConfig,
   id?: string,
+  buttonId?: string,
   title?: string,
 }
diff --git a/src/admin/components/elements/DuplicateDocument/index.tsx b/src/admin/components/elements/DuplicateDocument/index.tsx
index be3755d47..5c59984e2 100644
--- a/src/admin/components/elements/DuplicateDocument/index.tsx
+++ b/src/admin/components/elements/DuplicateDocument/index.tsx
@@ -27,6 +27,7 @@ const Duplicate: React.FC<Props> = ({ slug }) => {
 
   return (
     <Button
+      id="action-duplicate"
       buttonStyle="none"
       className={baseClass}
       onClick={handleClick}
diff --git a/src/admin/components/elements/Table/index.tsx b/src/admin/components/elements/Table/index.tsx
index 48c895a45..6418e4074 100644
--- a/src/admin/components/elements/Table/index.tsx
+++ b/src/admin/components/elements/Table/index.tsx
@@ -16,7 +16,10 @@ const Table: React.FC<Props> = ({ columns, data }) => {
           <thead>
             <tr>
               {columns.map((col, i) => (
-                <th key={i}>
+                <th
+                  key={i}
+                  id={`heading-${col.accessor}`}
+                >
                   {col.components.Heading}
                 </th>
               ))}
@@ -24,9 +27,15 @@ const Table: React.FC<Props> = ({ columns, data }) => {
           </thead>
           <tbody>
             {data && data.map((row, rowIndex) => (
-              <tr key={rowIndex}>
+              <tr
+                key={rowIndex}
+                className={`row-${rowIndex + 1}`}
+              >
                 {columns.map((col, colIndex) => (
-                  <td key={colIndex}>
+                  <td
+                    key={colIndex}
+                    className={`cell-${col.accessor}`}
+                  >
                     {col.components.renderCell(row, row[col.accessor])}
                   </td>
                 ))}
diff --git a/src/admin/components/elements/WhereBuilder/Condition/index.tsx b/src/admin/components/elements/WhereBuilder/Condition/index.tsx
index 8763f979c..c98fe8428 100644
--- a/src/admin/components/elements/WhereBuilder/Condition/index.tsx
+++ b/src/admin/components/elements/WhereBuilder/Condition/index.tsx
@@ -105,6 +105,7 @@ const Condition: React.FC<Props> = (props) => {
         <div className={`${baseClass}__actions`}>
           <Button
             icon="x"
+            className={`${baseClass}__actions-remove`}
             round
             buttonStyle="icon-label"
             iconStyle="with-border"
@@ -116,6 +117,7 @@ const Condition: React.FC<Props> = (props) => {
           />
           <Button
             icon="plus"
+            className={`${baseClass}__actions-add`}
             round
             buttonStyle="icon-label"
             iconStyle="with-border"
diff --git a/src/admin/components/forms/Submit/index.tsx b/src/admin/components/forms/Submit/index.tsx
index 86ff04475..e4f968e55 100644
--- a/src/admin/components/forms/Submit/index.tsx
+++ b/src/admin/components/forms/Submit/index.tsx
@@ -8,7 +8,7 @@ import './index.scss';
 const baseClass = 'form-submit';
 
 const FormSubmit: React.FC<Props> = (props) => {
-  const { children, disabled: disabledFromProps, type = 'submit' } = props;
+  const { children, buttonId: id, disabled: disabledFromProps, type = 'submit' } = props;
   const processing = useFormProcessing();
   const { disabled } = useForm();
 
@@ -16,6 +16,7 @@ const FormSubmit: React.FC<Props> = (props) => {
     <div className={baseClass}>
       <Button
         {...props}
+        id={id}
         type={type}
         disabled={disabledFromProps || processing || disabled ? true : undefined}
       >
diff --git a/src/admin/components/forms/field-types/Array/Array.tsx b/src/admin/components/forms/field-types/Array/Array.tsx
index a9c30f9fd..45074f4e9 100644
--- a/src/admin/components/forms/field-types/Array/Array.tsx
+++ b/src/admin/components/forms/field-types/Array/Array.tsx
@@ -202,6 +202,7 @@ const ArrayFieldType: React.FC<Props> = (props) => {
   return (
     <DragDropContext onDragEnd={onDragEnd}>
       <div
+        id={`field-${path}`}
         className={classes}
       >
         <div className={`${baseClass}__error-wrap`}>
diff --git a/src/admin/components/forms/field-types/Blocks/Blocks.tsx b/src/admin/components/forms/field-types/Blocks/Blocks.tsx
index bc29d29ac..58668128c 100644
--- a/src/admin/components/forms/field-types/Blocks/Blocks.tsx
+++ b/src/admin/components/forms/field-types/Blocks/Blocks.tsx
@@ -212,6 +212,7 @@ const Blocks: React.FC<Props> = (props) => {
   return (
     <DragDropContext onDragEnd={onDragEnd}>
       <div
+        id={`field-${path}`}
         className={classes}
       >
         <div className={`${baseClass}__error-wrap`}>
diff --git a/src/admin/components/forms/field-types/Checkbox/index.tsx b/src/admin/components/forms/field-types/Checkbox/index.tsx
index 6bcb0b292..cd99e0e05 100644
--- a/src/admin/components/forms/field-types/Checkbox/index.tsx
+++ b/src/admin/components/forms/field-types/Checkbox/index.tsx
@@ -70,9 +70,9 @@ const Checkbox: React.FC<Props> = (props) => {
         />
       </div>
       <input
+        id={`field-${path}`}
         type="checkbox"
         name={path}
-        id={path}
         checked={Boolean(value)}
         readOnly
       />
diff --git a/src/admin/components/forms/field-types/Code/Code.tsx b/src/admin/components/forms/field-types/Code/Code.tsx
index 0bdca7185..c9f78b72a 100644
--- a/src/admin/components/forms/field-types/Code/Code.tsx
+++ b/src/admin/components/forms/field-types/Code/Code.tsx
@@ -78,11 +78,12 @@ const Code: React.FC<Props> = (props) => {
         message={errorMessage}
       />
       <Label
-        htmlFor={path}
+        htmlFor={`field-${path}`}
         label={label}
         required={required}
       />
       <Editor
+        id={`field-${path}`}
         value={value as string || ''}
         onValueChange={readOnly ? () => null : setValue}
         highlight={highlighter}
diff --git a/src/admin/components/forms/field-types/ConfirmPassword/index.tsx b/src/admin/components/forms/field-types/ConfirmPassword/index.tsx
index 3428f2fb2..72f2a15c3 100644
--- a/src/admin/components/forms/field-types/ConfirmPassword/index.tsx
+++ b/src/admin/components/forms/field-types/ConfirmPassword/index.tsx
@@ -43,7 +43,7 @@ const ConfirmPassword: React.FC = () => {
         message={errorMessage}
       />
       <Label
-        htmlFor="confirm-password"
+        htmlFor="field-confirm-password"
         label="Confirm Password"
         required
       />
@@ -52,7 +52,7 @@ const ConfirmPassword: React.FC = () => {
         onChange={setValue}
         type="password"
         autoComplete="off"
-        id="confirm-password"
+        id="field-confirm-password"
         name="confirm-password"
       />
     </div>
diff --git a/src/admin/components/forms/field-types/DateTime/index.tsx b/src/admin/components/forms/field-types/DateTime/index.tsx
index a35795748..d34639544 100644
--- a/src/admin/components/forms/field-types/DateTime/index.tsx
+++ b/src/admin/components/forms/field-types/DateTime/index.tsx
@@ -76,7 +76,10 @@ const DateTime: React.FC<Props> = (props) => {
         label={label}
         required={required}
       />
-      <div className={`${baseClass}__input-wrapper`}>
+      <div
+        className={`${baseClass}__input-wrapper`}
+        id={`field-${path}`}
+      >
         <DatePicker
           {...date}
           placeholder={placeholder}
diff --git a/src/admin/components/forms/field-types/Email/index.tsx b/src/admin/components/forms/field-types/Email/index.tsx
index 3ef1fa7ef..0bc04412d 100644
--- a/src/admin/components/forms/field-types/Email/index.tsx
+++ b/src/admin/components/forms/field-types/Email/index.tsx
@@ -74,12 +74,12 @@ const Email: React.FC<Props> = (props) => {
         required={required}
       />
       <input
+        id={`field-${path}`}
         value={value as string || ''}
         onChange={setValue}
         disabled={Boolean(readOnly)}
         placeholder={placeholder}
         type="email"
-        id={path}
         name={path}
         autoComplete={autoComplete}
       />
diff --git a/src/admin/components/forms/field-types/Group/index.tsx b/src/admin/components/forms/field-types/Group/index.tsx
index 867ffaa1a..f28730ceb 100644
--- a/src/admin/components/forms/field-types/Group/index.tsx
+++ b/src/admin/components/forms/field-types/Group/index.tsx
@@ -33,6 +33,7 @@ const Group: React.FC<Props> = (props) => {
 
   return (
     <div
+      id={`field-${path}`}
       className={[
         'field-type',
         baseClass,
diff --git a/src/admin/components/forms/field-types/HiddenInput/index.tsx b/src/admin/components/forms/field-types/HiddenInput/index.tsx
index df97df9bf..7c7b3c2a0 100644
--- a/src/admin/components/forms/field-types/HiddenInput/index.tsx
+++ b/src/admin/components/forms/field-types/HiddenInput/index.tsx
@@ -25,6 +25,7 @@ const HiddenInput: React.FC<Props> = (props) => {
 
   return (
     <input
+      id={`field-${path}`}
       type="hidden"
       value={value as string || ''}
       onChange={setValue}
diff --git a/src/admin/components/forms/field-types/Number/index.tsx b/src/admin/components/forms/field-types/Number/index.tsx
index 951726be6..f35ecea26 100644
--- a/src/admin/components/forms/field-types/Number/index.tsx
+++ b/src/admin/components/forms/field-types/Number/index.tsx
@@ -79,17 +79,17 @@ const NumberField: React.FC<Props> = (props) => {
         message={errorMessage}
       />
       <Label
-        htmlFor={path}
+        htmlFor={`field-${path}`}
         label={label}
         required={required}
       />
       <input
+        id={`field-${path}`}
         value={typeof value === 'number' ? value : ''}
         onChange={handleChange}
         disabled={readOnly}
         placeholder={placeholder}
         type="number"
-        id={path}
         name={path}
         step={step}
       />
diff --git a/src/admin/components/forms/field-types/Password/index.tsx b/src/admin/components/forms/field-types/Password/index.tsx
index 61e88232e..0a816c854 100644
--- a/src/admin/components/forms/field-types/Password/index.tsx
+++ b/src/admin/components/forms/field-types/Password/index.tsx
@@ -60,17 +60,17 @@ const Password: React.FC<Props> = (props) => {
         message={errorMessage}
       />
       <Label
-        htmlFor={path}
+        htmlFor={`field-${path}`}
         label={label}
         required={required}
       />
       <input
+        id={`field-${path}`}
         value={value as string || ''}
         onChange={setValue}
         disabled={formProcessing}
         type="password"
         autoComplete={autoComplete}
-        id={path}
         name={path}
       />
     </div>
diff --git a/src/admin/components/forms/field-types/Point/index.tsx b/src/admin/components/forms/field-types/Point/index.tsx
index f73dd305a..a4bc44735 100644
--- a/src/admin/components/forms/field-types/Point/index.tsx
+++ b/src/admin/components/forms/field-types/Point/index.tsx
@@ -81,34 +81,34 @@ const PointField: React.FC<Props> = (props) => {
       <ul className={`${baseClass}__wrap`}>
         <li>
           <Label
-            htmlFor={`${path}.longitude`}
+            htmlFor={`field-longitude-${path}`}
             label={`${label} - Longitude`}
             required={required}
           />
           <input
+            id={`field-longitude-${path}`}
             value={(value && typeof value[0] === 'number') ? value[0] : ''}
             onChange={(e) => handleChange(e, 0)}
             disabled={readOnly}
             placeholder={placeholder}
             type="number"
-            id={`${path}.longitude`}
             name={`${path}.longitude`}
             step={step}
           />
         </li>
         <li>
           <Label
-            htmlFor={`${path}.latitude`}
+            htmlFor={`field-latitude-${path}`}
             label={`${label} - Latitude`}
             required={required}
           />
           <input
+            id={`field-latitude-${path}`}
             value={(value && typeof value[1] === 'number') ? value[1] : ''}
             onChange={(e) => handleChange(e, 1)}
             disabled={readOnly}
             placeholder={placeholder}
             type="number"
-            id={`${path}.latitude`}
             name={`${path}.latitude`}
             step={step}
           />
diff --git a/src/admin/components/forms/field-types/RadioGroup/Input.tsx b/src/admin/components/forms/field-types/RadioGroup/Input.tsx
index 52ac1e435..e170785e6 100644
--- a/src/admin/components/forms/field-types/RadioGroup/Input.tsx
+++ b/src/admin/components/forms/field-types/RadioGroup/Input.tsx
@@ -73,11 +73,14 @@ const RadioGroupInput: React.FC<RadioGroupInputProps> = (props) => {
         />
       </div>
       <Label
-        htmlFor={path}
+        htmlFor={`field-${path}`}
         label={label}
         required={required}
       />
-      <ul className={`${baseClass}--group`}>
+      <ul
+        id={`field-${path}`}
+        className={`${baseClass}--group`}
+      >
         {options.map((option) => {
           let optionValue = '';
 
diff --git a/src/admin/components/forms/field-types/RadioGroup/RadioInput/index.tsx b/src/admin/components/forms/field-types/RadioGroup/RadioInput/index.tsx
index c0fa71c38..672c9b8c5 100644
--- a/src/admin/components/forms/field-types/RadioGroup/RadioInput/index.tsx
+++ b/src/admin/components/forms/field-types/RadioGroup/RadioInput/index.tsx
@@ -13,7 +13,7 @@ const RadioInput: React.FC<Props> = (props) => {
     isSelected && `${baseClass}--is-selected`,
   ].filter(Boolean).join(' ');
 
-  const id = `${path}-${option.value}`;
+  const id = `field-${path}-${option.value}`;
 
   return (
     <label
diff --git a/src/admin/components/forms/field-types/Relationship/index.tsx b/src/admin/components/forms/field-types/Relationship/index.tsx
index ffbb650b6..8b4660d52 100644
--- a/src/admin/components/forms/field-types/Relationship/index.tsx
+++ b/src/admin/components/forms/field-types/Relationship/index.tsx
@@ -335,6 +335,7 @@ const Relationship: React.FC<Props> = (props) => {
 
   return (
     <div
+      id={`field-${path}`}
       className={classes}
       style={{
         ...style,
diff --git a/src/admin/components/forms/field-types/RichText/RichText.tsx b/src/admin/components/forms/field-types/RichText/RichText.tsx
index 1ec43992b..de4996a94 100644
--- a/src/admin/components/forms/field-types/RichText/RichText.tsx
+++ b/src/admin/components/forms/field-types/RichText/RichText.tsx
@@ -209,7 +209,7 @@ const RichText: React.FC<Props> = (props) => {
           message={errorMessage}
         />
         <Label
-          htmlFor={path}
+          htmlFor={`field-${path}`}
           label={label}
           required={required}
         />
@@ -270,6 +270,7 @@ const RichText: React.FC<Props> = (props) => {
               ref={editorRef}
             >
               <Editable
+                id={`field-${path}`}
                 className={`${baseClass}__input`}
                 renderElement={renderElement}
                 renderLeaf={renderLeaf}
diff --git a/src/admin/components/forms/field-types/Select/Input.tsx b/src/admin/components/forms/field-types/Select/Input.tsx
index 9c1fa6076..2cd545cca 100644
--- a/src/admin/components/forms/field-types/Select/Input.tsx
+++ b/src/admin/components/forms/field-types/Select/Input.tsx
@@ -62,6 +62,7 @@ const SelectInput: React.FC<SelectInputProps> = (props) => {
 
   return (
     <div
+      id={`field-${path}`}
       className={classes}
       style={{
         ...style,
diff --git a/src/admin/components/forms/field-types/Text/Input.tsx b/src/admin/components/forms/field-types/Text/Input.tsx
index 5269436dc..43e3addda 100644
--- a/src/admin/components/forms/field-types/Text/Input.tsx
+++ b/src/admin/components/forms/field-types/Text/Input.tsx
@@ -61,17 +61,17 @@ const TextInput: React.FC<TextInputProps> = (props) => {
         message={errorMessage}
       />
       <Label
-        htmlFor={path}
+        htmlFor={`field-${path}`}
         label={label}
         required={required}
       />
       <input
+        id={`field-${path}`}
         value={value || ''}
         onChange={onChange}
         disabled={readOnly}
         placeholder={placeholder}
         type="text"
-        id={path}
         name={path}
       />
       <FieldDescription
diff --git a/src/admin/components/forms/field-types/Textarea/Input.tsx b/src/admin/components/forms/field-types/Textarea/Input.tsx
index 9aed9d695..937ff60c6 100644
--- a/src/admin/components/forms/field-types/Textarea/Input.tsx
+++ b/src/admin/components/forms/field-types/Textarea/Input.tsx
@@ -62,16 +62,16 @@ const TextareaInput: React.FC<TextAreaInputProps> = (props) => {
         message={errorMessage}
       />
       <Label
-        htmlFor={path}
+        htmlFor={`field-${path}`}
         label={label}
         required={required}
       />
       <textarea
+        id={`field-${path}`}
         value={value || ''}
         onChange={onChange}
         disabled={readOnly}
         placeholder={placeholder}
-        id={path}
         name={path}
         rows={rows}
       />
diff --git a/src/admin/components/views/Dashboard/Default.tsx b/src/admin/components/views/Dashboard/Default.tsx
index 2dbe271d2..319ff2aff 100644
--- a/src/admin/components/views/Dashboard/Default.tsx
+++ b/src/admin/components/views/Dashboard/Default.tsx
@@ -47,6 +47,7 @@ const Dashboard: React.FC<Props> = (props) => {
               <li key={collection.slug}>
                 <Card
                   title={collection.labels.plural}
+                  id={`card-${collection.slug}`}
                   onClick={() => push({ pathname: `${admin}/collections/${collection.slug}` })}
                   actions={hasCreatePermission ? (
                     <Button
diff --git a/src/admin/components/views/collections/Edit/Default.tsx b/src/admin/components/views/collections/Edit/Default.tsx
index 1b1ec0bf4..2e82e0ae0 100644
--- a/src/admin/components/views/collections/Edit/Default.tsx
+++ b/src/admin/components/views/collections/Edit/Default.tsx
@@ -134,7 +134,14 @@ const DefaultEditView: React.FC<Props> = (props) => {
                   <ul className={`${baseClass}__collection-actions`}>
                     {(permissions?.create?.permission) && (
                     <React.Fragment>
-                      <li><Link to={`${admin}/collections/${slug}/create`}>Create New</Link></li>
+                      <li>
+                        <Link
+                          id="action-create"
+                          to={`${admin}/collections/${slug}/create`}
+                        >
+                          Create New
+                        </Link>
+                      </li>
                       {!disableDuplicate && (
                       <li><DuplicateDocument slug={slug} /></li>
                       )}
@@ -145,6 +152,7 @@ const DefaultEditView: React.FC<Props> = (props) => {
                       <DeleteDocument
                         collection={collection}
                         id={id}
+                        buttonId="action-delete"
                       />
                     </li>
                   )}
@@ -167,7 +175,7 @@ const DefaultEditView: React.FC<Props> = (props) => {
                         </React.Fragment>
                       )}
                       {!collection.versions?.drafts && (
-                        <FormSubmit>Save</FormSubmit>
+                        <FormSubmit buttonId="action-save">Save</FormSubmit>
                       )}
                     </React.Fragment>
                     )}
diff --git a/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.scss b/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.scss
new file mode 100644
index 000000000..ebdd21e31
--- /dev/null
+++ b/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.scss
@@ -0,0 +1,3 @@
+.relationship-cell {
+  min-width: 250px;
+}
diff --git a/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.tsx b/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.tsx
index cf47ace1b..b98c88041 100644
--- a/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.tsx
+++ b/src/admin/components/views/collections/List/Cell/field-types/Relationship/index.tsx
@@ -1,55 +1,68 @@
 import React, { useState, useEffect } from 'react';
 import { useConfig } from '../../../../../../utilities/Config';
+import useIntersect from '../../../../../../../hooks/useIntersect';
+import { useListRelationships } from '../../../RelationshipProvider';
+
+import './index.scss';
+
+type Value = { relationTo: string, value: number | string };
+const baseClass = 'relationship-cell';
+const totalToShow = 3;
 
 const RelationshipCell = (props) => {
   const { field, data: cellData } = props;
-  const { relationTo } = field;
-  const { collections } = useConfig();
-  const [data, setData] = useState();
+  const { collections, routes } = useConfig();
+  const [intersectionRef, entry] = useIntersect();
+  const [values, setValues] = useState<Value[]>([]);
+  const { getRelationships, documents } = useListRelationships();
+  const [hasRequested, setHasRequested] = useState(false);
+
+  const isAboveViewport = entry?.boundingClientRect?.top > 0;
 
   useEffect(() => {
-    const hasManyRelations = Array.isArray(relationTo);
+    if (cellData && isAboveViewport && !hasRequested) {
+      const formattedValues: Value[] = [];
 
-    if (cellData) {
-      if (Array.isArray(cellData)) {
-        setData(cellData.reduce((newData, value) => {
-          const relation = hasManyRelations ? value?.relationTo : relationTo;
-          const doc = hasManyRelations ? value.value : value;
-
-          const collection = collections.find((coll) => coll.slug === relation);
-
-          if (collection) {
-            const useAsTitle = collection.admin.useAsTitle ? collection.admin.useAsTitle : 'id';
-            let title: string;
-            if (typeof doc === 'string') {
-              title = doc;
-            } else {
-              title = doc?.[useAsTitle] ? doc[useAsTitle] : doc;
-            }
-
-            return newData ? `${newData}, ${title}` : title;
-          }
-
-          return newData;
-        }, ''));
-      } else {
-        const relation = hasManyRelations ? cellData?.relationTo : relationTo;
-        const doc = hasManyRelations ? cellData.value : cellData;
-        const collection = collections.find((coll) => coll.slug === relation);
-
-        if (collection && doc) {
-          const useAsTitle = collection.admin.useAsTitle ? collection.admin.useAsTitle : 'id';
-
-          setData(doc[useAsTitle] ? doc[useAsTitle] : doc);
+      const arrayCellData = Array.isArray(cellData) ? cellData : [cellData];
+      arrayCellData.slice(0, (arrayCellData.length < totalToShow ? arrayCellData.length : totalToShow)).forEach((cell) => {
+        if (typeof cell === 'object' && 'relationTo' in cell && 'value' in cell) {
+          formattedValues.push(cell);
         }
-      }
+        if ((typeof cell === 'number' || typeof cell === 'string') && typeof field.relationTo === 'string') {
+          formattedValues.push({
+            value: cell,
+            relationTo: field.relationTo,
+          });
+        }
+      });
+      getRelationships(formattedValues);
+      setHasRequested(true);
+      setValues(formattedValues);
     }
-  }, [cellData, relationTo, field, collections]);
+  }, [cellData, field, collections, isAboveViewport, routes.api, hasRequested, getRelationships]);
 
   return (
-    <React.Fragment>
-      {data}
-    </React.Fragment>
+    <div
+      className={baseClass}
+      ref={intersectionRef}
+    >
+      {values.map(({ relationTo, value }, i) => {
+        const document = documents[relationTo][value];
+        const relatedCollection = collections.find(({ slug }) => slug === relationTo);
+        return (
+          <React.Fragment key={i}>
+            { document === false && `Untitled - ID: ${value}`}
+            { document === null && 'Loading...'}
+            { document && (
+              document[relatedCollection.admin.useAsTitle] ? document[relatedCollection.admin.useAsTitle] : `Untitled - ID: ${value}`
+            )}
+            {values.length > i + 1 && ', '}
+          </React.Fragment>
+        );
+      })}
+      { Array.isArray(cellData) && cellData.length > totalToShow && ` and ${cellData.length - totalToShow} more` }
+      { values.length === 0 && `No <${field.label}>`}
+    </div>
   );
 };
 
diff --git a/src/admin/components/views/collections/List/Cell/field-types/Upload/index.tsx b/src/admin/components/views/collections/List/Cell/field-types/Upload/index.tsx
index 6f6403037..e69de29bb 100644
--- a/src/admin/components/views/collections/List/Cell/field-types/Upload/index.tsx
+++ b/src/admin/components/views/collections/List/Cell/field-types/Upload/index.tsx
@@ -1,11 +0,0 @@
-import React from 'react';
-
-const UploadCell = ({ data }) => (
-  <React.Fragment>
-    <span>
-      {data?.filename}
-    </span>
-  </React.Fragment>
-);
-
-export default UploadCell;
diff --git a/src/admin/components/views/collections/List/Cell/field-types/index.tsx b/src/admin/components/views/collections/List/Cell/field-types/index.tsx
index 77c1c6e72..e36d4c1f6 100644
--- a/src/admin/components/views/collections/List/Cell/field-types/index.tsx
+++ b/src/admin/components/views/collections/List/Cell/field-types/index.tsx
@@ -7,7 +7,6 @@ import relationship from './Relationship';
 import richText from './Richtext';
 import select from './Select';
 import textarea from './Textarea';
-import upload from './Upload';
 
 
 export default {
@@ -20,5 +19,5 @@ export default {
   richText,
   select,
   textarea,
-  upload,
+  upload: relationship,
 };
diff --git a/src/admin/components/views/collections/List/Default.tsx b/src/admin/components/views/collections/List/Default.tsx
index 61400345f..a0fe58bcc 100644
--- a/src/admin/components/views/collections/List/Default.tsx
+++ b/src/admin/components/views/collections/List/Default.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { useConfig } from '../../../utilities/Config';
 import UploadGallery from '../../../elements/UploadGallery';
 import Eyebrow from '../../../elements/Eyebrow';
@@ -13,6 +13,7 @@ import { Props } from './types';
 import ViewDescription from '../../../elements/ViewDescription';
 import PerPage from '../../../elements/PerPage';
 import { Gutter } from '../../../elements/Gutter';
+import { RelationshipProvider } from './RelationshipProvider';
 
 import './index.scss';
 
@@ -43,7 +44,6 @@ const DefaultList: React.FC<Props> = (props) => {
 
   const { routes: { admin } } = useConfig();
   const history = useHistory();
-  const { pathname, search } = useLocation();
 
   return (
     <div className={baseClass}>
@@ -73,14 +73,14 @@ const DefaultList: React.FC<Props> = (props) => {
           enableSort={Boolean(upload)}
         />
         {(data.docs && data.docs.length > 0) && (
-          <React.Fragment
-            key={`${pathname}${search}`}
-          >
+          <React.Fragment>
             {!upload && (
+            <RelationshipProvider>
               <Table
                 data={data.docs}
                 columns={tableColumns}
               />
+            </RelationshipProvider>
             )}
             {upload && (
               <UploadGallery
diff --git a/src/admin/components/views/collections/List/RelationshipProvider/index.tsx b/src/admin/components/views/collections/List/RelationshipProvider/index.tsx
new file mode 100644
index 000000000..b3f8b32b5
--- /dev/null
+++ b/src/admin/components/views/collections/List/RelationshipProvider/index.tsx
@@ -0,0 +1,79 @@
+import React, { createContext, useCallback, useContext, useEffect, useReducer, useRef } from 'react';
+import querystring from 'qs';
+import { useConfig } from '../../../../utilities/Config';
+import { TypeWithID } from '../../../../../../collections/config/types';
+import { reducer } from './reducer';
+import useDebounce from '../../../../../hooks/useDebounce';
+
+// documents are first set to null when requested
+// set to false when no doc is returned
+// or set to the document returned
+export type Documents = {
+ [slug: string]: {
+   [id: string | number]: TypeWithID | null | false
+ }
+}
+
+type ListRelationshipContext = {
+  getRelationships: (docs: {
+    relationTo: string,
+    value: number | string
+  }[]) => void;
+  documents: Documents
+}
+
+const Context = createContext({} as ListRelationshipContext);
+
+export const RelationshipProvider: React.FC<{children?: React.ReactNode}> = ({ children }) => {
+  const [documents, dispatchDocuments] = useReducer(reducer, {});
+  const debouncedDocuments = useDebounce(documents, 100);
+  const config = useConfig();
+  const {
+    serverURL,
+    routes: { api },
+  } = config;
+
+  useEffect(() => {
+    Object.entries(debouncedDocuments).forEach(async ([slug, docs]) => {
+      const idsToLoad: (string | number)[] = [];
+
+      Object.entries(docs).forEach(([id, value]) => {
+        if (value === null) {
+          idsToLoad.push(id);
+        }
+      });
+
+      if (idsToLoad.length > 0) {
+        const url = `${serverURL}${api}/${slug}`;
+        const params = {
+          depth: 0,
+          'where[id][in]': idsToLoad,
+          pagination: false,
+        };
+
+        const query = querystring.stringify(params, { addQueryPrefix: true });
+        const result = await fetch(`${url}${query}`);
+        if (result.ok) {
+          const json = await result.json();
+          if (json.docs) {
+            dispatchDocuments({ type: 'ADD_LOADED', docs: json.docs, relationTo: slug, idsToLoad });
+          }
+        } else {
+          dispatchDocuments({ type: 'ADD_LOADED', docs: [], relationTo: slug, idsToLoad });
+        }
+      }
+    });
+  }, [serverURL, api, debouncedDocuments]);
+
+  const getRelationships = useCallback(async (relationships: { relationTo: string, value: number | string }[]) => {
+    dispatchDocuments({ type: 'REQUEST', docs: relationships });
+  }, []);
+
+  return (
+    <Context.Provider value={{ getRelationships, documents }}>
+      {children}
+    </Context.Provider>
+  );
+};
+
+export const useListRelationships = (): ListRelationshipContext => useContext(Context);
diff --git a/src/admin/components/views/collections/List/RelationshipProvider/reducer.ts b/src/admin/components/views/collections/List/RelationshipProvider/reducer.ts
new file mode 100644
index 000000000..014d14c05
--- /dev/null
+++ b/src/admin/components/views/collections/List/RelationshipProvider/reducer.ts
@@ -0,0 +1,58 @@
+import { Documents } from './index';
+import { TypeWithID } from '../../../../../../collections/config/types';
+
+type RequestDocuments = {
+  type: 'REQUEST',
+  docs: { relationTo: string, value: number | string }[],
+}
+
+type AddLoadedDocuments = {
+  type: 'ADD_LOADED',
+  relationTo: string,
+  docs: TypeWithID[],
+  idsToLoad: (string | number)[]
+}
+
+type Action = RequestDocuments | AddLoadedDocuments;
+
+export function reducer(state: Documents, action: Action): Documents {
+  switch (action.type) {
+    case 'REQUEST': {
+      const newState = { ...state };
+
+      action.docs.forEach(({ relationTo, value }) => {
+        if (typeof newState[relationTo] !== 'object') {
+          newState[relationTo] = {};
+        }
+        newState[relationTo][value] = null;
+      });
+
+      return newState;
+    }
+
+    case 'ADD_LOADED': {
+      const newState = { ...state };
+      if (typeof newState[action.relationTo] !== 'object') {
+        newState[action.relationTo] = {};
+      }
+      const unreturnedIDs = [...action.idsToLoad];
+
+      if (Array.isArray(action.docs)) {
+        action.docs.forEach((doc) => {
+          unreturnedIDs.splice(unreturnedIDs.indexOf(doc.id), 1);
+          newState[action.relationTo][doc.id] = doc;
+        });
+      }
+
+      unreturnedIDs.forEach((id) => {
+        newState[action.relationTo][id] = false;
+      });
+
+      return newState;
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/admin/components/views/collections/List/buildColumns.tsx b/src/admin/components/views/collections/List/buildColumns.tsx
index fefaf4518..d9d0bc9e6 100644
--- a/src/admin/components/views/collections/List/buildColumns.tsx
+++ b/src/admin/components/views/collections/List/buildColumns.tsx
@@ -58,6 +58,7 @@ const buildColumns = (collection: SanitizedCollectionConfig, columns: string[]):
           ),
           renderCell: (rowData, cellData) => (
             <Cell
+              key={JSON.stringify(cellData)}
               field={field}
               colIndex={colIndex}
               collection={collection}
diff --git a/src/admin/components/views/collections/List/index.tsx b/src/admin/components/views/collections/List/index.tsx
index bad52584f..701935ffa 100644
--- a/src/admin/components/views/collections/List/index.tsx
+++ b/src/admin/components/views/collections/List/index.tsx
@@ -76,7 +76,7 @@ const ListView: React.FC<ListIndexProps> = (props) => {
 
   useEffect(() => {
     const params = {
-      depth: 1,
+      depth: 0,
       draft: 'true',
       page: undefined,
       sort: undefined,
@@ -107,7 +107,7 @@ const ListView: React.FC<ListIndexProps> = (props) => {
         setTableColumns(buildColumns(collection, currentPreferences?.columns));
       }
 
-      const params = queryString.parse(history.location.search, { ignoreQueryPrefix: true, depth: 10 });
+      const params = queryString.parse(history.location.search, { ignoreQueryPrefix: true, depth: 0 });
 
       const search = {
         ...params,
diff --git a/src/collections/operations/local/create.ts b/src/collections/operations/local/create.ts
index 13a3b9e7e..a277c9e87 100644
--- a/src/collections/operations/local/create.ts
+++ b/src/collections/operations/local/create.ts
@@ -1,4 +1,3 @@
-import { UploadedFile } from 'express-fileupload';
 import { Payload } from '../../..';
 import { PayloadRequest } from '../../../express/types';
 import { Document } from '../../../types';
diff --git a/test/dev/generateTypes.js b/test/dev/generateTypes.js
new file mode 100644
index 000000000..ec2fa5d88
--- /dev/null
+++ b/test/dev/generateTypes.js
@@ -0,0 +1,42 @@
+const path = require('path');
+const fs = require('fs');
+const babelConfig = require('../../babel.config');
+
+require('@babel/register')({
+  ...babelConfig,
+  extensions: ['.ts', '.tsx', '.js', '.jsx'],
+  env: {
+    development: {
+      sourceMaps: 'inline',
+      retainLines: true,
+    },
+  },
+});
+
+const { generateTypes } = require('../../src/bin/generateTypes');
+
+const [testConfigDir] = process.argv.slice(2);
+const testDir = path.resolve(__dirname, '../', testConfigDir);
+
+// Generate types for entire directory
+if (testConfigDir === 'int' || testConfigDir === 'e2e') {
+  fs.readdirSync(testDir, { withFileTypes: true })
+    .filter((f) => f.isDirectory())
+    .forEach((dir) => {
+      const suiteDir = path.resolve(testDir, dir.name);
+      setPaths(suiteDir);
+      generateTypes();
+    });
+  return;
+}
+
+// Generate for specific test suite directory
+setPaths(testDir);
+generateTypes();
+
+// Set config path and TS output path using test dir
+function setPaths(dir) {
+  const configPath = path.resolve(dir, 'config.ts');
+  process.env.PAYLOAD_CONFIG_PATH = configPath;
+  process.env.PAYLOAD_TS_OUTPUT_PATH = path.resolve(dir, 'payload-types.ts');
+}
diff --git a/test/dev/server.ts b/test/dev/server.ts
index 0980822ae..dce593b10 100644
--- a/test/dev/server.ts
+++ b/test/dev/server.ts
@@ -1,12 +1,13 @@
 /* eslint-disable no-console */
 import express from 'express';
+import { v4 as uuid } from 'uuid';
 import payload from '../../src';
 
 const expressApp = express();
 
 const init = async () => {
   await payload.init({
-    secret: 'SECRET_KEY',
+    secret: uuid(),
     mongoURL: process.env.MONGO_URL || 'mongodb://localhost/payload',
     express: expressApp,
     email: {
diff --git a/test/e2e/access-control/config.ts b/test/e2e/access-control/config.ts
index e296c8658..82fde1c3c 100644
--- a/test/e2e/access-control/config.ts
+++ b/test/e2e/access-control/config.ts
@@ -1,6 +1,10 @@
+import { devUser } from '../../credentials';
 import { buildConfig } from '../buildConfig';
+import type { ReadOnlyCollection } from './payload-types';
 
 export const slug = 'access-controls';
+export const readOnlySlug = 'read-only-collection';
+export const restrictedSlug = 'restricted';
 
 export default buildConfig({
   collections: [
@@ -17,20 +21,52 @@ export default buildConfig({
       ],
     },
     {
-      slug: 'restricted',
+      slug: restrictedSlug,
       fields: [],
       access: {
+        create: () => false,
         read: () => false,
+        update: () => false,
+        delete: () => false,
+      },
+    },
+    {
+      slug: readOnlySlug,
+      fields: [
+        {
+          name: 'name',
+          type: 'text',
+        },
+      ],
+      access: {
+        create: () => false,
+        read: () => true,
+        update: () => false,
+        delete: () => false,
       },
     },
   ],
   onInit: async (payload) => {
+    await payload.create({
+      collection: 'users',
+      data: {
+        email: devUser.email,
+        password: devUser.password,
+      },
+    });
+
     await payload.create({
       collection: slug,
       data: {
         restrictedField: 'restricted',
       },
     });
-  },
 
+    await payload.create<ReadOnlyCollection>({
+      collection: readOnlySlug,
+      data: {
+        name: 'read-only',
+      },
+    });
+  },
 });
diff --git a/test/e2e/access-control/index.spec.ts b/test/e2e/access-control/index.spec.ts
index ccfcc9b72..c566be281 100644
--- a/test/e2e/access-control/index.spec.ts
+++ b/test/e2e/access-control/index.spec.ts
@@ -3,21 +3,13 @@ import { expect, test } from '@playwright/test';
 import payload from '../../../src';
 import { AdminUrlUtil } from '../../helpers/adminUrlUtil';
 import { initPayloadE2E } from '../../helpers/configHelpers';
-import { firstRegister } from '../helpers';
-import { slug } from './config';
+import { login } from '../helpers';
+import { readOnlySlug, restrictedSlug, slug } from './config';
+import type { ReadOnlyCollection } from './payload-types';
 
 /**
  * TODO: Access Control
- * - [x] restricted collections not shown
- *  - no sidebar link
- *  - no route
- *  - no card
- * [x] field without read access should not show
  * prevent user from logging in (canAccessAdmin)
- * no create controls if no access
- * no update control if no update
- *  - check fields are rendered as readonly
- * no delete control if no access
  * no version controls is no access
  *
  * FSK: 'should properly prevent / allow public users from reading a restricted field'
@@ -26,26 +18,26 @@ import { slug } from './config';
  */
 
 const { beforeAll, describe } = test;
-let url: AdminUrlUtil;
 
 describe('access control', () => {
   let page: Page;
+  let url: AdminUrlUtil;
+  let restrictedUrl: AdminUrlUtil;
+  let readoOnlyUrl: AdminUrlUtil;
 
   beforeAll(async ({ browser }) => {
     const { serverURL } = await initPayloadE2E(__dirname);
-    // await clearDocs(); // Clear any seeded data from onInit
 
     url = new AdminUrlUtil(serverURL, slug);
+    restrictedUrl = new AdminUrlUtil(serverURL, restrictedSlug);
+    readoOnlyUrl = new AdminUrlUtil(serverURL, readOnlySlug);
 
     const context = await browser.newContext();
     page = await context.newPage();
 
-    await firstRegister({ page, serverURL });
+    await login({ page, serverURL });
   });
 
-  // afterEach(async () => {
-  // });
-
   test('field without read access should not show', async () => {
     const { id } = await createDoc({ restrictedField: 'restricted' });
 
@@ -55,9 +47,20 @@ describe('access control', () => {
   });
 
   describe('restricted collection', () => {
+    let existingDoc: ReadOnlyCollection;
+
+    beforeAll(async () => {
+      existingDoc = await payload.create<ReadOnlyCollection>({
+        collection: readOnlySlug,
+        data: {
+          name: 'name',
+        },
+      });
+    });
+
     test('should not show in card list', async () => {
       await page.goto(url.admin);
-      await expect(page.locator('.dashboard__card-list >> text=Restricteds')).toHaveCount(0);
+      await expect(page.locator(`#card-${restrictedSlug}`)).toHaveCount(0);
     });
 
     test('should not show in nav', async () => {
@@ -65,11 +68,67 @@ describe('access control', () => {
       await expect(page.locator('.nav >> a:has-text("Restricteds")')).toHaveCount(0);
     });
 
-    test('should not have collection url', async () => {
-      await page.goto(url.list);
-      await page.locator('text=Nothing found').click();
-      await page.locator('a:has-text("Back to Dashboard")').click();
-      await expect(page).toHaveURL(url.admin);
+    test('should not have list url', async () => {
+      await page.goto(restrictedUrl.list);
+      await expect(page.locator('.unauthorized')).toBeVisible();
+    });
+
+    test('should not have create url', async () => {
+      await page.goto(restrictedUrl.create);
+      await expect(page.locator('.unauthorized')).toBeVisible();
+    });
+
+    test('should not have access to existing doc', async () => {
+      await page.goto(restrictedUrl.edit(existingDoc.id));
+      await expect(page.locator('.unauthorized')).toBeVisible();
+    });
+  });
+
+  describe('read-only collection', () => {
+    let existingDoc: ReadOnlyCollection;
+
+    beforeAll(async () => {
+      existingDoc = await payload.create<ReadOnlyCollection>({
+        collection: readOnlySlug,
+        data: {
+          name: 'name',
+        },
+      });
+    });
+
+    test('should show in card list', async () => {
+      await page.goto(url.admin);
+      await expect(page.locator(`#card-${readOnlySlug}`)).toHaveCount(1);
+    });
+
+    test('should show in nav', async () => {
+      await page.goto(url.admin);
+      await expect(page.locator(`.nav a[href="/admin/collections/${readOnlySlug}"]`)).toHaveCount(1);
+    });
+
+    test('should have collection url', async () => {
+      await page.goto(readoOnlyUrl.list);
+      await expect(page).toHaveURL(readoOnlyUrl.list); // no redirect
+    });
+
+    test('should not have "Create New" button', async () => {
+      await page.goto(readoOnlyUrl.create);
+      await expect(page.locator('.collection-list__header a')).toHaveCount(0);
+    });
+
+    test('should not have quick create button', async () => {
+      await page.goto(url.admin);
+      await expect(page.locator(`#card-${readOnlySlug}`)).not.toHaveClass('card__actions');
+    });
+
+    test('edit view should not have buttons', async () => {
+      await page.goto(readoOnlyUrl.edit(existingDoc.id));
+      await expect(page.locator('.collection-edit__collection-actions li')).toHaveCount(0);
+    });
+
+    test('fields should be read-only', async () => {
+      await page.goto(readoOnlyUrl.edit(existingDoc.id));
+      await expect(page.locator('#field-name')).toBeDisabled();
     });
   });
 });
diff --git a/test/e2e/access-control/payload-types.ts b/test/e2e/access-control/payload-types.ts
new file mode 100644
index 000000000..d632a9727
--- /dev/null
+++ b/test/e2e/access-control/payload-types.ts
@@ -0,0 +1,51 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "access-controls".
+ */
+export interface AccessControl {
+  id: string;
+  restrictedField?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "restricted".
+ */
+export interface Restricted {
+  id: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "read-only-collection".
+ */
+export interface ReadOnlyCollection {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/auth/payload-types.ts b/test/e2e/auth/payload-types.ts
new file mode 100644
index 000000000..0315d69a4
--- /dev/null
+++ b/test/e2e/auth/payload-types.ts
@@ -0,0 +1,27 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  enableAPIKey?: boolean;
+  apiKey?: string;
+  apiKeyIndex?: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  _verified?: boolean;
+  _verificationToken?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/buildConfig.ts b/test/e2e/buildConfig.ts
index cece6dec5..d48f0d8c8 100644
--- a/test/e2e/buildConfig.ts
+++ b/test/e2e/buildConfig.ts
@@ -3,7 +3,11 @@ import { buildConfig as buildPayloadConfig } from '../../src/config/build';
 import type { Config, SanitizedConfig } from '../../src/config/types';
 
 export function buildConfig(overrides?: Partial<Config>): SanitizedConfig {
-  const baseConfig: Config = {};
+  const baseConfig: Config = {
+    typescript: {
+      outputFile: process.env.PAYLOAD_TS_OUTPUT_PATH,
+    },
+  };
   if (process.env.NODE_ENV === 'test') {
     baseConfig.admin = {
       webpack: (config) => ({
diff --git a/test/e2e/collections/config.ts b/test/e2e/collections/config.ts
index 8528e8f8a..9552a3c55 100644
--- a/test/e2e/collections/config.ts
+++ b/test/e2e/collections/config.ts
@@ -1,4 +1,5 @@
 import { mapAsync } from '../../../src/utilities/mapAsync';
+import { devUser } from '../../credentials';
 import { buildConfig } from '../buildConfig';
 
 export const slug = 'posts';
@@ -26,6 +27,14 @@ export default buildConfig({
     ],
   }],
   onInit: async (payload) => {
+    await payload.create({
+      collection: 'users',
+      data: {
+        email: devUser.email,
+        password: devUser.password,
+      },
+    });
+
     await mapAsync([...Array(11)], async () => {
       await payload.create({
         collection: slug,
diff --git a/test/e2e/collections/index.spec.ts b/test/e2e/collections/index.spec.ts
index bce06f9a8..34e08b8f7 100644
--- a/test/e2e/collections/index.spec.ts
+++ b/test/e2e/collections/index.spec.ts
@@ -2,8 +2,8 @@ import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
 import payload from '../../../src';
 import { AdminUrlUtil } from '../../helpers/adminUrlUtil';
-import { initPayloadTest } from '../../helpers/configHelpers';
-import { firstRegister, saveDocAndAssert } from '../helpers';
+import { initPayloadE2E } from '../../helpers/configHelpers';
+import { login, saveDocAndAssert } from '../helpers';
 import type { Post } from './config';
 import { slug } from './config';
 import { mapAsync } from '../../../src/utilities/mapAsync';
@@ -20,19 +20,14 @@ describe('collections', () => {
   let page: Page;
 
   beforeAll(async ({ browser }) => {
-    const { serverURL } = await initPayloadTest({
-      __dirname,
-      init: {
-        local: false,
-      },
-    });
+    const { serverURL } = await initPayloadE2E(__dirname);
     await clearDocs(); // Clear any seeded data from onInit
     url = new AdminUrlUtil(serverURL, slug);
 
     const context = await browser.newContext();
     page = await context.newPage();
 
-    await firstRegister({ page, serverURL });
+    await login({ page, serverURL });
   });
 
   afterEach(async () => {
@@ -50,13 +45,13 @@ describe('collections', () => {
 
     test('should navigate to collection - card', async () => {
       await page.goto(url.admin);
-      await page.locator('a:has-text("Posts")').click();
+      await page.locator(`#card-${slug}`).click();
       expect(page.url()).toContain(url.list);
     });
 
-    test('breadcrumbs - from card to dashboard', async () => {
+    test('breadcrumbs - from list to dashboard', async () => {
       await page.goto(url.list);
-      await page.locator('a:has-text("Dashboard")').click();
+      await page.locator('.step-nav a[href="/admin"]').click();
       expect(page.url()).toContain(url.admin);
     });
 
@@ -64,7 +59,7 @@ describe('collections', () => {
       const { id } = await createPost();
 
       await page.goto(url.edit(id));
-      await page.locator('nav >> text=Posts').click();
+      await page.locator(`.step-nav >> text=${slug}`).click();
       expect(page.url()).toContain(url.list);
     });
   });
@@ -73,14 +68,14 @@ describe('collections', () => {
   describe('CRUD', () => {
     test('should create', async () => {
       await page.goto(url.create);
-      await page.locator('#title').fill(title);
-      await page.locator('#description').fill(description);
-      await page.click('text=Save', { delay: 100 });
+      await page.locator('#field-title').fill(title);
+      await page.locator('#field-description').fill(description);
+      await page.click('#action-save', { delay: 100 });
 
       await saveDocAndAssert(page);
 
-      await expect(page.locator('#title')).toHaveValue(title);
-      await expect(page.locator('#description')).toHaveValue(description);
+      await expect(page.locator('#field-title')).toHaveValue(title);
+      await expect(page.locator('#field-description')).toHaveValue(description);
     });
 
     test('should read existing', async () => {
@@ -88,8 +83,8 @@ describe('collections', () => {
 
       await page.goto(url.edit(id));
 
-      await expect(page.locator('#title')).toHaveValue(title);
-      await expect(page.locator('#description')).toHaveValue(description);
+      await expect(page.locator('#field-title')).toHaveValue(title);
+      await expect(page.locator('#field-description')).toHaveValue(description);
     });
 
     test('should update existing', async () => {
@@ -99,21 +94,21 @@ describe('collections', () => {
 
       const newTitle = 'new title';
       const newDesc = 'new description';
-      await page.locator('#title').fill(newTitle);
-      await page.locator('#description').fill(newDesc);
+      await page.locator('#field-title').fill(newTitle);
+      await page.locator('#field-description').fill(newDesc);
 
       await saveDocAndAssert(page);
 
-      await expect(page.locator('#title')).toHaveValue(newTitle);
-      await expect(page.locator('#description')).toHaveValue(newDesc);
+      await expect(page.locator('#field-title')).toHaveValue(newTitle);
+      await expect(page.locator('#field-description')).toHaveValue(newDesc);
     });
 
     test('should delete existing', async () => {
       const { id } = await createPost();
 
       await page.goto(url.edit(id));
-      await page.locator('button:has-text("Delete")').click();
-      await page.locator('button:has-text("Confirm")').click();
+      await page.locator('#action-delete').click();
+      await page.locator('#confirm-delete').click();
 
       await expect(page.locator(`text=Post "${id}" successfully deleted.`)).toBeVisible();
       expect(page.url()).toContain(url.list);
@@ -123,10 +118,10 @@ describe('collections', () => {
       const { id } = await createPost();
 
       await page.goto(url.edit(id));
-      await page.locator('button:has-text("Duplicate")').click();
+      await page.locator('#action-duplicate').click();
 
       expect(page.url()).toContain(url.create);
-      await page.locator('button:has-text("Save")').click();
+      await page.locator('#action-save').click();
       expect(page.url()).not.toContain(id); // new id
     });
   });
@@ -149,7 +144,7 @@ describe('collections', () => {
       test('toggle columns', async () => {
         const columnCountLocator = 'table >> thead >> tr >> th';
         await createPost();
-        await page.locator('button:has-text("Columns")').click();
+        await page.locator('.list-controls__toggle-columns').click();
         await wait(1000); // Wait for column toggle UI, should probably use waitForSelector
 
         const numberOfColumns = await page.locator(columnCountLocator).count();
@@ -170,13 +165,13 @@ describe('collections', () => {
 
         await expect(page.locator(tableRowLocator)).toHaveCount(2);
 
-        await page.locator('button:has-text("Filters")').click();
+        await page.locator('.list-controls__toggle-where').click();
         await wait(1000); // Wait for column toggle UI, should probably use waitForSelector
 
-        await page.locator('text=Add filter').click();
+        await page.locator('.where-builder__add-first-filter').click();
 
-        const operatorField = page.locator('.condition >> .condition__operator');
-        const valueField = page.locator('.condition >> .condition__value >> input');
+        const operatorField = page.locator('.condition__operator');
+        const valueField = page.locator('.condition__value >> input');
 
         await operatorField.click();
 
@@ -192,7 +187,7 @@ describe('collections', () => {
         expect(firstId).toEqual(id);
 
         // Remove filter
-        await page.locator('.condition >> .icon--x').click();
+        await page.locator('.condition__actions-remove').click();
         await wait(1000);
         await expect(page.locator(tableRowLocator)).toHaveCount(2);
       });
@@ -237,14 +232,11 @@ describe('collections', () => {
 
         await expect(getTableItems()).toHaveCount(2);
 
-        const chevrons = page.locator('table >> thead >> th >> button');
-        const upChevron = chevrons.first();
-        const downChevron = chevrons.nth(1);
+        const upChevron = page.locator('#heading-id .sort-column__asc');
+        const downChevron = page.locator('#heading-id .sort-column__desc');
 
-        const getFirstId = async () => getTableItems().first().locator('td').first()
-          .innerText();
-        const getSecondId = async () => getTableItems().nth(1).locator('td').first()
-          .innerText();
+        const getFirstId = async () => page.locator('.row-1 .cell-id').innerText();
+        const getSecondId = async () => page.locator('.row-2 .cell-id').innerText();
 
         const firstId = await getFirstId();
         const secondId = await getSecondId();
diff --git a/test/e2e/collections/payload-types.ts b/test/e2e/collections/payload-types.ts
new file mode 100644
index 000000000..8416d61e0
--- /dev/null
+++ b/test/e2e/collections/payload-types.ts
@@ -0,0 +1,33 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  title?: string;
+  description?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/fields-array/payload-types.ts b/test/e2e/fields-array/payload-types.ts
new file mode 100644
index 000000000..82bb38503
--- /dev/null
+++ b/test/e2e/fields-array/payload-types.ts
@@ -0,0 +1,35 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "fields-array".
+ */
+export interface FieldsArray {
+  id: string;
+  readOnlyArray?: {
+    text?: string;
+    id?: string;
+  }[];
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/fields-relationship/config.ts b/test/e2e/fields-relationship/config.ts
index 6124c0bf1..dfe232e6e 100644
--- a/test/e2e/fields-relationship/config.ts
+++ b/test/e2e/fields-relationship/config.ts
@@ -1,5 +1,7 @@
 import type { CollectionConfig } from '../../../src/collections/config/types';
 import { buildConfig } from '../buildConfig';
+import { devUser } from '../../credentials';
+import { mapAsync } from '../../../src/utilities/mapAsync';
 
 export const slug = 'fields-relationship';
 
@@ -12,6 +14,7 @@ export interface FieldsRelationship {
   id: string;
   relationship: RelationOne;
   relationshipHasMany: RelationOne[];
+  relationshipHasManyMultiple: Array<RelationOne | RelationTwo | { relationTo: string, value: string}>;
   relationshipMultiple: Array<RelationOne | RelationTwo>;
   relationshipRestricted: RelationRestricted;
   relationshipWithTitle: RelationWithTitle;
@@ -38,6 +41,9 @@ export default buildConfig({
   collections: [
     {
       slug,
+      admin: {
+        defaultColumns: ['id', 'relationship', 'relationshipRestricted', 'relationshipHasManyMultiple', 'relationshipWithTitle'],
+      },
       fields: [
         {
           type: 'relationship',
@@ -55,6 +61,12 @@ export default buildConfig({
           name: 'relationshipMultiple',
           relationTo: [relationOneSlug, relationTwoSlug],
         },
+        {
+          type: 'relationship',
+          name: 'relationshipHasManyMultiple',
+          hasMany: true,
+          relationTo: [relationOneSlug, relationTwoSlug],
+        },
         {
           type: 'relationship',
           name: 'relationshipRestricted',
@@ -94,6 +106,13 @@ export default buildConfig({
     },
   ],
   onInit: async (payload) => {
+    await payload.create({
+      collection: 'users',
+      data: {
+        email: devUser.email,
+        password: devUser.password,
+      },
+    });
     // Create docs to relate to
     const { id: relationOneDocId } = await payload.create<RelationOne>({
       collection: relationOneSlug,
@@ -102,18 +121,26 @@ export default buildConfig({
       },
     });
 
-    await payload.create<RelationOne>({
-      collection: relationOneSlug,
-      data: {
-        name: relationOneSlug,
-      },
+    const relationOneIDs = [];
+    await mapAsync([...Array(5)], async () => {
+      const doc = await payload.create<RelationOne>({
+        collection: relationOneSlug,
+        data: {
+          name: relationOneSlug,
+        },
+      });
+      relationOneIDs.push(doc.id);
     });
 
-    await payload.create<RelationTwo>({
-      collection: relationTwoSlug,
-      data: {
-        name: relationTwoSlug,
-      },
+    const relationTwoIDs = [];
+    await mapAsync([...Array(11)], async () => {
+      const doc = await payload.create<RelationTwo>({
+        collection: relationTwoSlug,
+        data: {
+          name: relationTwoSlug,
+        },
+      });
+      relationTwoIDs.push(doc.id);
     });
 
     // Existing relationships
@@ -129,14 +156,36 @@ export default buildConfig({
         name: 'relation-title',
       },
     });
-    await payload.create<RelationOne>({
+    await payload.create<FieldsRelationship>({
       collection: slug,
       data: {
-        name: 'with-existing-relations',
         relationship: relationOneDocId,
         relationshipRestricted: restrictedDocId,
         relationshipWithTitle: relationWithTitleDocId,
       },
     });
+    await mapAsync([...Array(11)], async () => {
+      await payload.create<FieldsRelationship>({
+        collection: slug,
+        data: {
+          relationship: relationOneDocId,
+          relationshipRestricted: restrictedDocId,
+          relationshipHasManyMultiple: relationOneIDs.map((id) => ({ relationTo: relationOneSlug, value: id })),
+        },
+      });
+    });
+    await mapAsync([...Array(15)], async () => {
+      const relationOneID = relationOneIDs[Math.floor(Math.random() * 10)];
+      const relationTwoID = relationTwoIDs[Math.floor(Math.random() * 10)];
+      await payload.create<FieldsRelationship>({
+        collection: slug,
+        data: {
+          relationship: relationOneDocId,
+          relationshipRestricted: restrictedDocId,
+          relationshipHasMany: [relationOneID],
+          relationshipHasManyMultiple: [{ relationTo: relationTwoSlug, value: relationTwoID }],
+        },
+      });
+    });
   },
 });
diff --git a/test/e2e/fields-relationship/index.spec.ts b/test/e2e/fields-relationship/index.spec.ts
index e2559a759..2f1020a31 100644
--- a/test/e2e/fields-relationship/index.spec.ts
+++ b/test/e2e/fields-relationship/index.spec.ts
@@ -3,8 +3,8 @@ import { expect, test } from '@playwright/test';
 import payload from '../../../src';
 import { mapAsync } from '../../../src/utilities/mapAsync';
 import { AdminUrlUtil } from '../../helpers/adminUrlUtil';
-import { initPayloadTest } from '../../helpers/configHelpers';
-import { firstRegister, saveDocAndAssert } from '../helpers';
+import { initPayloadE2E, initPayloadTest } from '../../helpers/configHelpers';
+import { login, saveDocAndAssert } from '../helpers';
 import type {
   FieldsRelationship as CollectionWithRelationships,
   RelationOne,
@@ -19,6 +19,7 @@ import {
   relationWithTitleSlug,
   slug,
 } from './config';
+import wait from '../../../src/utilities/wait';
 
 const { beforeAll, describe } = test;
 
@@ -35,12 +36,7 @@ describe('fields - relationship', () => {
   let relationWithTitle: RelationWithTitle;
 
   beforeAll(async ({ browser }) => {
-    const { serverURL } = await initPayloadTest({
-      __dirname,
-      init: {
-        local: false,
-      },
-    });
+    const { serverURL } = await initPayloadE2E(__dirname);
     await clearAllDocs();
 
     url = new AdminUrlUtil(serverURL, slug);
@@ -97,16 +93,15 @@ describe('fields - relationship', () => {
       },
     });
 
-    await firstRegister({ page, serverURL });
+    await login({ page, serverURL });
   });
 
   test('should create relationship', async () => {
     await page.goto(url.create);
 
-    const fields = page.locator('.render-fields >> .react-select');
-    const relationshipField = fields.nth(0);
+    const field = page.locator('#field-relationship');
 
-    await relationshipField.click({ delay: 100 });
+    await field.click({ delay: 100 });
 
     const options = page.locator('.rs__option');
 
@@ -114,7 +109,7 @@ describe('fields - relationship', () => {
 
     // Select a relationship
     await options.nth(1).click();
-    await expect(relationshipField).toContainText(relationOneDoc.id);
+    await expect(field).toContainText(relationOneDoc.id);
 
     await saveDocAndAssert(page);
   });
@@ -122,10 +117,9 @@ describe('fields - relationship', () => {
   test('should create hasMany relationship', async () => {
     await page.goto(url.create);
 
-    const fields = page.locator('.render-fields >> .react-select');
-    const relationshipHasManyField = fields.nth(1);
+    const field = page.locator('.field-relationshipHasMany');
 
-    await relationshipHasManyField.click({ delay: 100 });
+    await field.click({ delay: 100 });
 
     const options = page.locator('.rs__option');
 
@@ -133,16 +127,16 @@ describe('fields - relationship', () => {
 
     // Add one relationship
     await options.locator(`text=${relationOneDoc.id}`).click();
-    await expect(relationshipHasManyField).toContainText(relationOneDoc.id);
-    await expect(relationshipHasManyField).not.toContainText(anotherRelationOneDoc.id);
+    await expect(field).toContainText(relationOneDoc.id);
+    await expect(field).not.toContainText(anotherRelationOneDoc.id);
 
     // Add second relationship
-    await relationshipHasManyField.click({ delay: 100 });
+    await field.click({ delay: 100 });
     await options.locator(`text=${anotherRelationOneDoc.id}`).click();
-    await expect(relationshipHasManyField).toContainText(anotherRelationOneDoc.id);
+    await expect(field).toContainText(anotherRelationOneDoc.id);
 
     // No options left
-    await relationshipHasManyField.click({ delay: 100 });
+    await field.click({ delay: 100 });
     await expect(page.locator('.rs__menu')).toHaveText('No options');
 
     await saveDocAndAssert(page);
@@ -151,10 +145,9 @@ describe('fields - relationship', () => {
   test('should create relations to multiple collections', async () => {
     await page.goto(url.create);
 
-    const fields = page.locator('.render-fields >> .react-select');
-    const relationshipMultipleField = fields.nth(2);
+    const field = page.locator('.field-relationshipMultiple');
 
-    await relationshipMultipleField.click({ delay: 100 });
+    await field.click({ delay: 100 });
 
     const options = page.locator('.rs__option');
 
@@ -162,12 +155,12 @@ describe('fields - relationship', () => {
 
     // Add one relationship
     await options.locator(`text=${relationOneDoc.id}`).click();
-    await expect(relationshipMultipleField).toContainText(relationOneDoc.id);
+    await expect(field).toContainText(relationOneDoc.id);
 
     // Add relationship of different collection
-    await relationshipMultipleField.click({ delay: 100 });
+    await field.click({ delay: 100 });
     await options.locator(`text=${relationTwoDoc.id}`).click();
-    await expect(relationshipMultipleField).toContainText(relationTwoDoc.id);
+    await expect(field).toContainText(relationTwoDoc.id);
 
     await saveDocAndAssert(page);
   });
@@ -176,11 +169,10 @@ describe('fields - relationship', () => {
     test('should highlight existing relationship', async () => {
       await page.goto(url.edit(docWithExistingRelations.id));
 
-      const fields = page.locator('.render-fields >> .react-select');
-      const relationOneField = fields.nth(0);
+      const field = page.locator('#field-relationship');
 
       // Check dropdown options
-      await relationOneField.click({ delay: 100 });
+      await field.click({ delay: 100 });
 
       await expect(page.locator('.rs__option--is-selected')).toHaveCount(1);
       await expect(page.locator('.rs__option--is-selected')).toHaveText(relationOneDoc.id);
@@ -189,33 +181,58 @@ describe('fields - relationship', () => {
     test('should show untitled ID on restricted relation', async () => {
       await page.goto(url.edit(docWithExistingRelations.id));
 
-      const fields = page.locator('.render-fields >> .react-select');
-      const restrictedRelationField = fields.nth(3);
+      const field = page.locator('#field-relationshipRestricted');
 
       // Check existing relationship has untitled ID
-      await expect(restrictedRelationField).toContainText(`Untitled - ID: ${restrictedRelation.id}`);
+      await expect(field).toContainText(`Untitled - ID: ${restrictedRelation.id}`);
 
       // Check dropdown options
-      await restrictedRelationField.click({ delay: 100 });
+      await field.click({ delay: 100 });
       const options = page.locator('.rs__option');
 
       await expect(options).toHaveCount(2); // None + 1 Unitled ID
     });
 
+    // test.todo('should paginate within the dropdown');
+    // test.todo('should search within the relationship field');
+
     test('should show useAsTitle on relation', async () => {
       await page.goto(url.edit(docWithExistingRelations.id));
 
-      const fields = page.locator('.render-fields >> .react-select');
-      const relationWithTitleField = fields.nth(4);
+      const field = page.locator('#field-relationshipWithTitle .react-select');
 
       // Check existing relationship for correct title
-      await expect(relationWithTitleField).toHaveText(relationWithTitle.name);
+      await expect(field).toHaveText(relationWithTitle.name);
 
-      await relationWithTitleField.click({ delay: 100 });
+      await field.click({ delay: 100 });
       const options = page.locator('.rs__option');
 
       await expect(options).toHaveCount(2); // None + 1 Doc
     });
+
+    test('should show id on relation in list view', async () => {
+      await page.goto(url.list);
+      await wait(110);
+      const cells = page.locator('.cell-relationship');
+      const relationship = cells.nth(0);
+      await expect(relationship).toHaveText(relationOneDoc.id);
+    });
+
+    test('should show Untitled ID on restricted relation in list view', async () => {
+      await page.goto(url.list);
+      await wait(110);
+      const cells = page.locator('.cell-relationshipRestricted');
+      const relationship = cells.nth(0);
+      await expect(relationship).toContainText('Untitled - ID: ');
+    });
+
+    test('should show useAsTitle on relation in list view', async () => {
+      await page.goto(url.list);
+      await wait(110);
+      const cells = page.locator('.cell-relationshipWithTitle');
+      const relationship = cells.nth(0);
+      await expect(relationship).toHaveText(relationWithTitle.name);
+    });
   });
 });
 
diff --git a/test/e2e/fields-relationship/payload-types.ts b/test/e2e/fields-relationship/payload-types.ts
new file mode 100644
index 000000000..e668538a5
--- /dev/null
+++ b/test/e2e/fields-relationship/payload-types.ts
@@ -0,0 +1,94 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "fields-relationship".
+ */
+export interface FieldsRelationship {
+  id: string;
+  relationship?: string | RelationOne;
+  relationshipHasMany?: (string | RelationOne)[];
+  relationshipMultiple?:
+    | {
+        value: string | RelationOne;
+        relationTo: 'relation-one';
+      }
+    | {
+        value: string | RelationTwo;
+        relationTo: 'relation-two';
+      };
+  relationshipHasManyMultiple?: (
+    | {
+        value: string | RelationOne;
+        relationTo: 'relation-one';
+      }
+    | {
+        value: string | RelationTwo;
+        relationTo: 'relation-two';
+      }
+  )[];
+  relationshipRestricted?: string | RelationRestricted;
+  relationshipWithTitle?: string | RelationWithTitle;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-one".
+ */
+export interface RelationOne {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-two".
+ */
+export interface RelationTwo {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-restricted".
+ */
+export interface RelationRestricted {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-with-title".
+ */
+export interface RelationWithTitle {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/fields/payload-types.ts b/test/e2e/fields/payload-types.ts
new file mode 100644
index 000000000..d95c8dacd
--- /dev/null
+++ b/test/e2e/fields/payload-types.ts
@@ -0,0 +1,32 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "text-fields".
+ */
+export interface TextField {
+  id: string;
+  text: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/helpers.ts b/test/e2e/helpers.ts
index d63390209..bf0ffc3c0 100644
--- a/test/e2e/helpers.ts
+++ b/test/e2e/helpers.ts
@@ -17,9 +17,9 @@ export async function firstRegister(args: FirstRegisterArgs): Promise<void> {
   const { page, serverURL } = args;
 
   await page.goto(`${serverURL}/admin`);
-  await page.fill('#email', devUser.email);
-  await page.fill('#password', devUser.password);
-  await page.fill('#confirm-password', devUser.password);
+  await page.fill('#field-email', devUser.email);
+  await page.fill('#field-password', devUser.password);
+  await page.fill('#field-confirm-password', devUser.password);
   await wait(500);
   await page.click('[type=submit]');
   await page.waitForURL(`${serverURL}/admin`);
@@ -29,15 +29,15 @@ export async function login(args: LoginArgs): Promise<void> {
   const { page, serverURL } = args;
 
   await page.goto(`${serverURL}/admin`);
-  await page.fill('#email', devUser.email);
-  await page.fill('#password', devUser.password);
+  await page.fill('#field-email', devUser.email);
+  await page.fill('#field-password', devUser.password);
   await wait(500);
   await page.click('[type=submit]');
   await page.waitForURL(`${serverURL}/admin`);
 }
 
 export async function saveDocAndAssert(page: Page): Promise<void> {
-  await page.click('text=Save', { delay: 100 });
+  await page.click('#action-save', { delay: 100 });
   await expect(page.locator('.Toastify')).toContainText('successfully');
   expect(page.url()).not.toContain('create');
 }
diff --git a/test/e2e/localization/payload-types.ts b/test/e2e/localization/payload-types.ts
new file mode 100644
index 000000000..7e29dac82
--- /dev/null
+++ b/test/e2e/localization/payload-types.ts
@@ -0,0 +1,33 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "localized-posts".
+ */
+export interface LocalizedPost {
+  id: string;
+  title?: string;
+  description?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/uploads/.gitignore b/test/e2e/uploads/.gitignore
new file mode 100644
index 000000000..9938aa6b4
--- /dev/null
+++ b/test/e2e/uploads/.gitignore
@@ -0,0 +1 @@
+/media
diff --git a/test/e2e/uploads/config.ts b/test/e2e/uploads/config.ts
new file mode 100644
index 000000000..b4250055c
--- /dev/null
+++ b/test/e2e/uploads/config.ts
@@ -0,0 +1,102 @@
+import path from 'path';
+import fs from 'fs';
+import { buildConfig } from '../buildConfig';
+import { devUser } from '../../credentials';
+import getFileByPath from '../../../src/uploads/getFileByPath';
+
+export const mediaSlug = 'media';
+
+export const relationSlug = 'relation';
+
+const mockModulePath = path.resolve(__dirname, './mocks/mockFSModule.js');
+
+export default buildConfig({
+  admin: {
+    webpack: (config) => ({
+      ...config,
+      resolve: {
+        ...config.resolve,
+        alias: {
+          ...config.resolve.alias,
+          fs: mockModulePath,
+        },
+      },
+    }),
+  },
+  // upload: {},
+  collections: [
+    {
+      slug: relationSlug,
+      fields: [
+        {
+          name: 'image',
+          type: 'upload',
+          relationTo: 'media',
+        },
+      ],
+    },
+    {
+      slug: mediaSlug,
+      upload: {
+        staticURL: '/media',
+        staticDir: './media',
+        imageSizes: [
+          {
+            name: 'maintainedAspectRatio',
+            width: 1024,
+            height: null,
+            crop: 'center',
+          },
+          {
+            name: 'tablet',
+            width: 640,
+            height: 480,
+            crop: 'left top',
+          },
+          {
+            name: 'mobile',
+            width: 320,
+            height: 240,
+            crop: 'left top',
+          },
+          {
+            name: 'icon',
+            width: 16,
+            height: 16,
+          },
+        ],
+      },
+      fields: [
+      ],
+    },
+  ],
+  onInit: async (payload) => {
+    // delete files in /media
+    const mediaDir = path.resolve(__dirname, './media');
+    fs.readdirSync(mediaDir).forEach((f) => fs.rmSync(`${mediaDir}/${f}`));
+
+    await payload.create({
+      collection: 'users',
+      data: {
+        email: devUser.email,
+        password: devUser.password,
+      },
+    });
+    // Create image
+    const filePath = path.resolve(__dirname, './image.png');
+    const file = getFileByPath(filePath);
+
+    const { id: uploadedImage } = await payload.create({
+      collection: mediaSlug,
+      data: {},
+      file,
+    });
+
+    await payload.create({
+      collection: relationSlug,
+      data: {
+        image: uploadedImage,
+      },
+    });
+  },
+});
diff --git a/tests-old/api/assets/image.png b/test/e2e/uploads/image.png
similarity index 100%
rename from tests-old/api/assets/image.png
rename to test/e2e/uploads/image.png
diff --git a/test/e2e/uploads/index.spec.ts b/test/e2e/uploads/index.spec.ts
new file mode 100644
index 000000000..f7ae50545
--- /dev/null
+++ b/test/e2e/uploads/index.spec.ts
@@ -0,0 +1,88 @@
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+import { AdminUrlUtil } from '../../helpers/adminUrlUtil';
+import { initPayloadE2E } from '../../helpers/configHelpers';
+import { login, saveDocAndAssert } from '../helpers';
+import { relationSlug, mediaSlug } from './config';
+import type { Media } from './payload-types';
+import wait from '../../../src/utilities/wait';
+import payload from '../../../src';
+
+const { beforeAll, describe } = test;
+
+let mediaURL: AdminUrlUtil;
+let relationURL: AdminUrlUtil;
+
+describe('uploads', () => {
+  let page: Page;
+  let mediaDoc: Media;
+
+  beforeAll(async ({ browser }) => {
+    const { serverURL } = await initPayloadE2E(__dirname);
+
+    mediaURL = new AdminUrlUtil(serverURL, mediaSlug);
+    relationURL = new AdminUrlUtil(serverURL, relationSlug);
+
+    const context = await browser.newContext();
+    page = await context.newPage();
+
+    const findMedia = await payload.find({
+      collection: mediaSlug,
+      depth: 0,
+      pagination: false,
+    });
+    mediaDoc = findMedia.docs[0] as Media;
+
+    await login({ page, serverURL });
+  });
+
+  test('should see upload filename in relation list', async () => {
+    await page.goto(relationURL.list);
+
+    await wait(110);
+    const field = page.locator('.cell-image');
+
+    await expect(field).toContainText('image.png');
+  });
+
+  test('should show upload filename in upload collection list', async () => {
+    await page.goto(mediaURL.list);
+
+    const media = page.locator('.upload-card__filename');
+    await wait(110);
+
+    await expect(media).toHaveText('image.png');
+  });
+
+  test('should create file upload', async () => {
+    await page.goto(mediaURL.create);
+
+    await page.setInputFiles('input[type="file"]', './image.png');
+
+    const filename = page.locator('.file-field__filename');
+
+    await expect(filename).toContainText('.png');
+
+    await page.locator('.form-submit button').click();
+
+    await saveDocAndAssert(page);
+  });
+
+  test('should show resized images', async () => {
+    await page.goto(mediaURL.edit(mediaDoc.id));
+
+    await page.locator('.btn.file-details__toggle-more-info').click();
+
+    const maintainedAspectRatioMeta = page.locator('.file-details__sizes .file-meta').nth(0);
+    await expect(maintainedAspectRatioMeta).toContainText('1024x1024');
+
+    const tabletMeta = page.locator('.file-details__sizes .file-meta').nth(1);
+    await expect(tabletMeta).toContainText('640x480');
+
+    const mobileMeta = page.locator('.file-details__sizes .file-meta').nth(2);
+    await expect(mobileMeta).toContainText('320x240');
+
+    const iconMeta = page.locator('.file-details__sizes .file-meta').nth(3);
+    await expect(iconMeta).toContainText('16x16');
+  });
+});
diff --git a/test/e2e/uploads/mocks/mockFSModule.js b/test/e2e/uploads/mocks/mockFSModule.js
new file mode 100644
index 000000000..f79bc626f
--- /dev/null
+++ b/test/e2e/uploads/mocks/mockFSModule.js
@@ -0,0 +1,4 @@
+export default {
+  readdirSync: () => {},
+  rmSync: () => {},
+};
diff --git a/test/e2e/uploads/payload-types.ts b/test/e2e/uploads/payload-types.ts
new file mode 100644
index 000000000..7a846af56
--- /dev/null
+++ b/test/e2e/uploads/payload-types.ts
@@ -0,0 +1,81 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation".
+ */
+export interface Relation {
+  id: string;
+  image?: string | Media;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  url?: string;
+  filename?: string;
+  mimeType?: string;
+  filesize?: number;
+  width?: number;
+  height?: number;
+  sizes?: {
+    maintainedAspectRatio?: {
+      url?: string;
+      width?: number;
+      height?: number;
+      mimeType?: string;
+      filesize?: number;
+      filename?: string;
+    };
+    tablet?: {
+      url?: string;
+      width?: number;
+      height?: number;
+      mimeType?: string;
+      filesize?: number;
+      filename?: string;
+    };
+    mobile?: {
+      url?: string;
+      width?: number;
+      height?: number;
+      mimeType?: string;
+      filesize?: number;
+      filename?: string;
+    };
+    icon?: {
+      url?: string;
+      width?: number;
+      height?: number;
+      mimeType?: string;
+      filesize?: number;
+      filename?: string;
+    };
+  };
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/e2e/versions/payload-types.ts b/test/e2e/versions/payload-types.ts
new file mode 100644
index 000000000..545c3ef3f
--- /dev/null
+++ b/test/e2e/versions/payload-types.ts
@@ -0,0 +1,31 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "slugname".
+ */
+export interface Slugname {
+  id: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/helpers/rest.ts b/test/helpers/rest.ts
index 3cdaa2366..af30cf52e 100644
--- a/test/helpers/rest.ts
+++ b/test/helpers/rest.ts
@@ -3,6 +3,7 @@ import qs from 'qs';
 import type { Config } from '../../src/config/types';
 import type { PaginatedDocs } from '../../src/mongoose/types';
 import type { Where } from '../../src/types';
+import { devUser } from '../credentials';
 
 require('isomorphic-fetch');
 
@@ -68,8 +69,8 @@ export class RESTClient {
 
   async login(incomingArgs?: LoginArgs): Promise<string> {
     const args = incomingArgs ?? {
-      email: 'dev@payloadcms.com',
-      password: 'test',
+      email: devUser.email,
+      password: devUser.password,
       collection: 'users',
     };
 
diff --git a/test/int/array-update/index.spec.ts b/test/int/array-update/index.spec.ts
index 14d4c4597..a02d60abd 100644
--- a/test/int/array-update/index.spec.ts
+++ b/test/int/array-update/index.spec.ts
@@ -2,6 +2,7 @@ import mongoose from 'mongoose';
 import { initPayloadTest } from '../../helpers/configHelpers';
 import payload from '../../../src';
 import config from './config';
+import type { Array as ArrayCollection } from './payload-types';
 
 const collection = config.collections[0]?.slug;
 
@@ -47,7 +48,7 @@ describe('array-update', () => {
     };
 
 
-    const updatedDoc = await payload.update({
+    const updatedDoc = await payload.update<ArrayCollection>({
       id: doc.id,
       collection,
       data: {
@@ -55,7 +56,7 @@ describe('array-update', () => {
       },
     });
 
-    expect(updatedDoc.array[0]).toMatchObject({
+    expect(updatedDoc.array?.[0]).toMatchObject({
       required: updatedText,
       optional: originalText,
     });
@@ -69,7 +70,7 @@ describe('array-update', () => {
       optional: 'optional test',
     };
 
-    const doc = await payload.create({
+    const doc = await payload.create<ArrayCollection>({
       collection,
       data: {
         array: [
@@ -82,7 +83,7 @@ describe('array-update', () => {
       },
     });
 
-    const updatedDoc = await payload.update<any>({
+    const updatedDoc = await payload.update<ArrayCollection>({
       id: doc.id,
       collection,
       data: {
@@ -91,8 +92,8 @@ describe('array-update', () => {
             required: updatedText,
           },
           {
-            id: doc.array[1].id,
-            required: doc.array[1].required,
+            id: doc.array?.[1].id,
+            required: doc.array?.[1].required as string,
             // NOTE - not passing optional field. It should persist
             // because we're passing ID
           },
@@ -100,9 +101,9 @@ describe('array-update', () => {
       },
     });
 
-    expect(updatedDoc.array[0].required).toStrictEqual(updatedText);
-    expect(updatedDoc.array[0].optional).toBeUndefined();
+    expect(updatedDoc.array?.[0].required).toStrictEqual(updatedText);
+    expect(updatedDoc.array?.[0].optional).toBeUndefined();
 
-    expect(updatedDoc.array[1]).toMatchObject(secondArrayItem);
+    expect(updatedDoc.array?.[1]).toMatchObject(secondArrayItem);
   });
 });
diff --git a/test/int/array-update/payload-types.ts b/test/int/array-update/payload-types.ts
new file mode 100644
index 000000000..5dfead267
--- /dev/null
+++ b/test/int/array-update/payload-types.ts
@@ -0,0 +1,36 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "arrays".
+ */
+export interface Array {
+  id: string;
+  array?: {
+    required: string;
+    optional?: string;
+    id?: string;
+  }[];
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/int/buildConfig.ts b/test/int/buildConfig.ts
index 1a445b8f4..793a30966 100644
--- a/test/int/buildConfig.ts
+++ b/test/int/buildConfig.ts
@@ -3,7 +3,11 @@ import { buildConfig as buildPayloadConfig } from '../../src/config/build';
 import type { Config, SanitizedConfig } from '../../src/config/types';
 
 export function buildConfig(overrides?: Partial<Config>): SanitizedConfig {
-  const baseConfig: Config = {};
+  const baseConfig: Config = {
+    typescript: {
+      outputFile: process.env.PAYLOAD_TS_OUTPUT_PATH,
+    },
+  };
 
   if (process.env.NODE_ENV === 'test') {
     baseConfig.admin = {
diff --git a/test/int/collections-graphql/index.spec.ts b/test/int/collections-graphql/index.spec.ts
index e125fdd12..71142b2d4 100644
--- a/test/int/collections-graphql/index.spec.ts
+++ b/test/int/collections-graphql/index.spec.ts
@@ -3,6 +3,7 @@ import { initPayloadTest } from '../../helpers/configHelpers';
 import config from './config';
 import payload from '../../../src';
 import { RESTClient } from '../../helpers/rest';
+import type { Post } from './payload-types';
 
 const collection = config.collections[0]?.slug;
 
@@ -11,7 +12,7 @@ let client: RESTClient;
 describe('collections-graphql', () => {
   beforeAll(async () => {
     const { serverURL } = await initPayloadTest({ __dirname, init: { local: false } });
-    client = new RESTClient(config, { serverURL });
+    client = new RESTClient(config, { serverURL, defaultSlug: collection });
   });
 
   afterAll(async () => {
@@ -23,7 +24,7 @@ describe('collections-graphql', () => {
   it('should create', async () => {
     const title = 'hello';
 
-    const { doc } = await client.create({
+    const { doc } = await client.create<Post>({
       slug: collection,
       data: {
         title,
diff --git a/test/int/collections-graphql/payload-types.ts b/test/int/collections-graphql/payload-types.ts
new file mode 100644
index 000000000..3e93e6640
--- /dev/null
+++ b/test/int/collections-graphql/payload-types.ts
@@ -0,0 +1,32 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  title?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}
diff --git a/test/int/collections-rest/config.ts b/test/int/collections-rest/config.ts
index abad5ea0e..27db8a7dd 100644
--- a/test/int/collections-rest/config.ts
+++ b/test/int/collections-rest/config.ts
@@ -1,23 +1,13 @@
 import type { CollectionConfig } from '../../../src/collections/config/types';
+import { devUser } from '../../credentials';
 import { buildConfig } from '../buildConfig';
-
-export interface Post {
-  id: string;
-  title: string;
-  description?: string;
-  number?: number;
-  relationField?: Relation | string
-  relationHasManyField?: RelationHasMany[] | string[]
-  relationMultiRelationTo?: Relation[] | string[]
-}
+import type { Post } from './payload-types';
 
 export interface Relation {
-  id: string
-  name: string
+  id: string;
+  name: string;
 }
 
-export type RelationHasMany = Relation
-
 const openAccess = {
   create: () => true,
   read: () => true,
@@ -25,9 +15,9 @@ const openAccess = {
   delete: () => true,
 };
 
-const collectionWithName = (slug: string): CollectionConfig => {
+const collectionWithName = (collectionSlug: string): CollectionConfig => {
   return {
-    slug,
+    slug: collectionSlug,
     access: openAccess,
     fields: [
       {
@@ -39,9 +29,7 @@ const collectionWithName = (slug: string): CollectionConfig => {
 };
 
 export const slug = 'posts';
-export const relationSlug = 'relation-normal';
-export const relationHasManySlug = 'relation-has-many';
-export const relationMultipleRelationToSlug = 'relation-multi-relation-to';
+export const relationSlug = 'relation';
 export default buildConfig({
   collections: [
     {
@@ -70,7 +58,7 @@ export default buildConfig({
         {
           name: 'relationHasManyField',
           type: 'relationship',
-          relationTo: relationHasManySlug,
+          relationTo: relationSlug,
           hasMany: true,
         },
         // Relation multiple relationTo
@@ -79,27 +67,84 @@ export default buildConfig({
           type: 'relationship',
           relationTo: [relationSlug, 'dummy'],
         },
+        // Relation multiple relationTo hasMany
+        {
+          name: 'relationMultiRelationToHasMany',
+          type: 'relationship',
+          relationTo: [relationSlug, 'dummy'],
+          hasMany: true,
+        },
       ],
     },
     collectionWithName(relationSlug),
-    collectionWithName(relationHasManySlug),
     collectionWithName('dummy'),
   ],
   onInit: async (payload) => {
-    const rel1 = await payload.create<RelationHasMany>({
-      collection: relationHasManySlug,
+    await payload.create({
+      collection: 'users',
+      data: {
+        email: devUser.email,
+        password: devUser.password,
+      },
+    });
+
+    const rel1 = await payload.create<Relation>({
+      collection: relationSlug,
       data: {
         name: 'name',
       },
     });
+    const rel2 = await payload.create<Relation>({
+      collection: relationSlug,
+      data: {
+        name: 'name2',
+      },
+    });
 
-    await payload.create({
+    // Relation - hasMany
+    await payload.create<Post>({
       collection: slug,
       data: {
-        title: 'title',
+        title: 'rel to hasMany',
         relationHasManyField: rel1.id,
       },
     });
-  },
+    await payload.create<Post>({
+      collection: slug,
+      data: {
+        title: 'rel to hasMany 2',
+        relationHasManyField: rel2.id,
+      },
+    });
 
+    // Relation - relationTo multi
+    await payload.create<Post>({
+      collection: slug,
+      data: {
+        title: 'rel to multi',
+        relationMultiRelationTo: {
+          relationTo: relationSlug,
+          value: rel2.id,
+        },
+      },
+    });
+
+    // Relation - relationTo multi hasMany
+    await payload.create<Post>({
+      collection: slug,
+      data: {
+        title: 'rel to multi hasMany',
+        relationMultiRelationToHasMany: [
+          {
+            relationTo: relationSlug,
+            value: rel1.id,
+          },
+          {
+            relationTo: relationSlug,
+            value: rel2.id,
+          },
+        ],
+      },
+    });
+  },
 });
diff --git a/test/int/collections-rest/index.spec.ts b/test/int/collections-rest/index.spec.ts
index 5e25483c8..b4fdbd9cd 100644
--- a/test/int/collections-rest/index.spec.ts
+++ b/test/int/collections-rest/index.spec.ts
@@ -1,10 +1,11 @@
 import mongoose from 'mongoose';
 import { initPayloadTest } from '../../helpers/configHelpers';
-import type { Relation, Post, RelationHasMany } from './config';
-import config, { relationHasManySlug, slug, relationSlug } from './config';
+import type { Relation } from './config';
+import config, { slug, relationSlug } from './config';
 import payload from '../../../src';
 import { RESTClient } from '../../helpers/rest';
 import { mapAsync } from '../../../src/utilities/mapAsync';
+import type { Post } from './payload-types';
 
 let client: RESTClient;
 
@@ -85,54 +86,75 @@ describe('collections-rest', () => {
     });
   });
 
-
   describe('Querying', () => {
     describe('Relationships', () => {
-      it('should query nested relationship', async () => {
-        const nameToQuery = 'name';
-        const { doc: relation } = await client.create<Relation>({
+      let post: Post;
+      let relation: Relation;
+      let relation2: Relation;
+      const nameToQuery = 'name';
+      const nameToQuery2 = 'name';
+
+      beforeEach(async () => {
+        ({ doc: relation } = await client.create<Relation>({
           slug: relationSlug,
           data: {
             name: nameToQuery,
           },
-        });
+        }));
 
-        const post1 = await createPost({
+        ({ doc: relation2 } = await client.create<Relation>({
+          slug: relationSlug,
+          data: {
+            name: nameToQuery2,
+          },
+        }));
+
+        post = await createPost({
           relationField: relation.id,
         });
-        await createPost();
 
-        const { status, result } = await client.find<Post>({
-          query: {
-            'relationField.name': {
-              equals: nameToQuery,
+        await createPost(); // Extra post to allow asserting totalDoc count
+      });
+
+      describe('regular relationship', () => {
+        it('query by property value', async () => {
+          const { status, result } = await client.find<Post>({
+            query: {
+              'relationField.name': {
+                equals: relation.name,
+              },
             },
-          },
+          });
+
+          expect(status).toEqual(200);
+          expect(result.docs).toEqual([post]);
+          expect(result.totalDocs).toEqual(1);
         });
 
-        expect(status).toEqual(200);
-        expect(result.docs).toEqual([post1]);
-        expect(result.totalDocs).toEqual(1);
+        it('query by id', async () => {
+          const { status, result } = await client.find<Post>({
+            query: {
+              relationField: {
+                equals: relation.id,
+              },
+            },
+          });
+
+          expect(status).toEqual(200);
+          expect(result.docs).toEqual([post]);
+          expect(result.totalDocs).toEqual(1);
+        });
       });
 
       it('should query nested relationship - hasMany', async () => {
-        const nameToQuery = 'name';
-        const { doc: relation } = await client.create<RelationHasMany>({
-          slug: relationHasManySlug,
-          data: {
-            name: nameToQuery,
-          },
-        });
-
         const post1 = await createPost({
-          relationHasManyField: [relation.id],
+          relationHasManyField: [relation.id, relation2.id],
         });
-        await createPost();
 
         const { status, result } = await client.find<Post>({
           query: {
             'relationHasManyField.name': {
-              equals: nameToQuery,
+              equals: relation.name,
             },
           },
         });
@@ -140,6 +162,81 @@ describe('collections-rest', () => {
         expect(status).toEqual(200);
         expect(result.docs).toEqual([post1]);
         expect(result.totalDocs).toEqual(1);
+
+        // Query second relationship
+        const { status: status2, result: result2 } = await client.find<Post>({
+          query: {
+            'relationHasManyField.name': {
+              equals: relation2.name,
+            },
+          },
+        });
+
+        expect(status2).toEqual(200);
+        expect(result2.docs).toEqual([post1]);
+        expect(result2.totalDocs).toEqual(1);
+      });
+
+      describe('relationTo multi', () => {
+        it('nested by id', async () => {
+          const post1 = await createPost({
+            relationMultiRelationTo: { relationTo: relationSlug, value: relation.id },
+          });
+          await createPost();
+
+          const { status, result } = await client.find<Post>({
+            query: {
+              'relationMultiRelationTo.value': {
+                equals: relation.id,
+              },
+            },
+          });
+
+          expect(status).toEqual(200);
+          expect(result.docs).toEqual([post1]);
+          expect(result.totalDocs).toEqual(1);
+        });
+
+        it.todo('nested by property value');
+      });
+
+      describe('relationTo multi hasMany', () => {
+        it('nested by id', async () => {
+          const post1 = await createPost({
+            relationMultiRelationToHasMany: [
+              { relationTo: relationSlug, value: relation.id },
+              { relationTo: relationSlug, value: relation2.id },
+            ],
+          });
+          await createPost();
+
+          const { status, result } = await client.find<Post>({
+            query: {
+              'relationMultiRelationToHasMany.value': {
+                equals: relation.id,
+              },
+            },
+          });
+
+          expect(status).toEqual(200);
+          expect(result.docs).toEqual([post1]);
+          expect(result.totalDocs).toEqual(1);
+
+          // Query second relation
+          const { status: status2, result: result2 } = await client.find<Post>({
+            query: {
+              'relationMultiRelationToHasMany.value': {
+                equals: relation.id,
+              },
+            },
+          });
+
+          expect(status2).toEqual(200);
+          expect(result2.docs).toEqual([post1]);
+          expect(result2.totalDocs).toEqual(1);
+        });
+
+        it.todo('nested by property value');
       });
     });
 
@@ -215,7 +312,7 @@ describe('collections-rest', () => {
         const { status, result } = await client.find<Post>({
           query: {
             title: {
-              like: post1.title.substring(0, 6),
+              like: post1.title?.substring(0, 6),
             },
           },
         });
@@ -412,7 +509,6 @@ describe('collections-rest', () => {
   });
 });
 
-
 async function createPost(overrides?: Partial<Post>) {
   const { doc } = await client.create<Post>({ data: { title: 'title', ...overrides } });
   return doc;
diff --git a/test/int/collections-rest/payload-types.ts b/test/int/collections-rest/payload-types.ts
new file mode 100644
index 000000000..bc39874e9
--- /dev/null
+++ b/test/int/collections-rest/payload-types.ts
@@ -0,0 +1,75 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by Payload CMS.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  title?: string;
+  description?: string;
+  number?: number;
+  relationField?: string | Relation;
+  relationHasManyField?: (string | Relation)[];
+  relationMultiRelationTo?:
+    | {
+        value: string | Relation;
+        relationTo: 'relation';
+      }
+    | {
+        value: string | Dummy;
+        relationTo: 'dummy';
+      };
+  relationMultiRelationToHasMany?: (
+    | {
+        value: string | Relation;
+        relationTo: 'relation';
+      }
+    | {
+        value: string | Dummy;
+        relationTo: 'dummy';
+      }
+  )[];
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation".
+ */
+export interface Relation {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "dummy".
+ */
+export interface Dummy {
+  id: string;
+  name?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  email?: string;
+  resetPasswordToken?: string;
+  resetPasswordExpiration?: string;
+  loginAttempts?: number;
+  lockUntil?: string;
+  createdAt: string;
+  updatedAt: string;
+}