diff --git a/demo/collections/Autosave.ts b/demo/collections/Autosave.ts
new file mode 100644
index 0000000000..83dc2bbb92
--- /dev/null
+++ b/demo/collections/Autosave.ts
@@ -0,0 +1,68 @@
+import { CollectionConfig } from '../../src/collections/config/types';
+
+const Autosave: CollectionConfig = {
+  slug: 'autosave-posts',
+  labels: {
+    singular: 'Autosave Post',
+    plural: 'Autosave Posts',
+  },
+  admin: {
+    useAsTitle: 'title',
+    defaultColumns: [
+      'title',
+      'description',
+      'createdAt',
+    ],
+  },
+  versions: {
+    maxPerDoc: 5,
+    retainDeleted: false,
+    drafts: {
+      autosave: {
+        interval: 5,
+      },
+    },
+  },
+  access: {
+    read: ({ req: { user } }) => {
+      if (user) {
+        return true;
+      }
+
+      return {
+        or: [
+          {
+            _status: {
+              equals: 'published',
+            },
+          },
+          {
+            _status: {
+              exists: false,
+            },
+          },
+        ],
+      };
+    },
+    readVersions: ({ req: { user } }) => Boolean(user),
+  },
+  fields: [
+    {
+      name: 'title',
+      label: 'Title',
+      type: 'text',
+      required: true,
+      unique: true,
+      localized: true,
+    },
+    {
+      name: 'description',
+      label: 'Description',
+      type: 'textarea',
+      required: true,
+    },
+  ],
+  timestamps: true,
+};
+
+export default Autosave;
diff --git a/demo/collections/Localized.ts b/demo/collections/Localized.ts
index 4ae59d6f75..8876c6cbb2 100644
--- a/demo/collections/Localized.ts
+++ b/demo/collections/Localized.ts
@@ -43,37 +43,8 @@ const LocalizedPosts: CollectionConfig = {
     ],
     enableRichTextRelationship: true,
   },
-  versions: {
-    maxPerDoc: 5,
-    retainDeleted: false,
-    drafts: {
-      autosave: {
-        interval: 5,
-      },
-    },
-  },
   access: {
-    read: ({ req: { user } }) => {
-      if (user) {
-        return true;
-      }
-
-      return {
-        or: [
-          {
-            _status: {
-              equals: 'published',
-            },
-          },
-          {
-            _status: {
-              exists: false,
-            },
-          },
-        ],
-      };
-    },
-    readVersions: ({ req: { user } }) => Boolean(user),
+    read: () => true,
   },
   fields: [
     {
diff --git a/demo/payload.config.ts b/demo/payload.config.ts
index 33d48b8004..72d84729a5 100644
--- a/demo/payload.config.ts
+++ b/demo/payload.config.ts
@@ -4,6 +4,7 @@ import { buildConfig } from '../src/config/build';
 import Admin from './collections/Admin';
 import AllFields from './collections/AllFields';
 import AutoLabel from './collections/AutoLabel';
+import Autosave from './collections/Autosave';
 import Code from './collections/Code';
 import Conditions from './collections/Conditions';
 // import CustomComponents from './collections/CustomComponents';
@@ -85,6 +86,7 @@ export default buildConfig({
     Admin,
     AllFields,
     AutoLabel,
+    Autosave,
     Code,
     Conditions,
     // CustomComponents,
diff --git a/src/admin/components/elements/Pill/index.scss b/src/admin/components/elements/Pill/index.scss
index 83b98e0e95..13e0fec497 100644
--- a/src/admin/components/elements/Pill/index.scss
+++ b/src/admin/components/elements/Pill/index.scss
@@ -11,6 +11,7 @@
   border-radius: $style-radius-s;
   padding: 0 base(.25);
   padding-left: base(.0875 + .25);
+  cursor: default;
 
   &:active,
   &:focus {
@@ -37,12 +38,14 @@
   }
 
   &--style-light {
-    &:hover {
-      background: lighten($color-light-gray, 3%);
-    }
+    &.pill--has-action {
+      &:hover {
+        background: lighten($color-light-gray, 3%);
+      }
 
-    &:active {
-      background: lighten($color-light-gray, 5%);
+      &:active {
+        background: lighten($color-light-gray, 5%);
+      }
     }
   }
 
@@ -51,6 +54,14 @@
     color: $color-dark-gray;
   }
 
+  &--style-warning {
+    background: $color-yellow;
+  }
+
+  &--style-success {
+    background: $color-green;
+  }
+
   &--style-dark {
     background: $color-dark-gray;
     color: white;
@@ -59,12 +70,14 @@
       @include color-svg(white);
     }
 
-    &:hover {
-      background: lighten($color-dark-gray, 3%);
-    }
+    &.pill--has-action {
+      &:hover {
+        background: lighten($color-dark-gray, 3%);
+      }
 
-    &:active {
-      background: lighten($color-dark-gray, 5%);
+      &:active {
+        background: lighten($color-dark-gray, 5%);
+      }
     }
   }
 }
diff --git a/src/admin/components/elements/Pill/types.ts b/src/admin/components/elements/Pill/types.ts
index ded6e6db74..9aab40aea9 100644
--- a/src/admin/components/elements/Pill/types.ts
+++ b/src/admin/components/elements/Pill/types.ts
@@ -4,7 +4,7 @@ export type Props = {
   icon?: React.ReactNode,
   alignIcon?: 'left' | 'right',
   onClick?: () => void,
-  pillStyle?: 'light' | 'dark' | 'light-gray',
+  pillStyle?: 'light' | 'dark' | 'light-gray' | 'warning' | 'success',
 }
 
 export type RenderedTypeProps = {
diff --git a/src/admin/components/views/Version/Compare/index.tsx b/src/admin/components/views/Version/Compare/index.tsx
index 2fef4ba8bc..6244780e09 100644
--- a/src/admin/components/views/Version/Compare/index.tsx
+++ b/src/admin/components/views/Version/Compare/index.tsx
@@ -5,7 +5,7 @@ import format from 'date-fns/format';
 import { Props } from './types';
 import ReactSelect from '../../../elements/ReactSelect';
 import { PaginatedDocs } from '../../../../../mongoose/types';
-import { publishedVersionOption } from '../shared';
+import { mostRecentVersionOption } from '../shared';
 
 import './index.scss';
 
@@ -14,7 +14,7 @@ const baseClass = 'compare-version';
 const maxResultsPerRequest = 10;
 
 const baseOptions = [
-  publishedVersionOption,
+  mostRecentVersionOption,
 ];
 
 const CompareVersion: React.FC<Props> = (props) => {
diff --git a/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx b/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
index 29139ec821..5c27477d75 100644
--- a/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
+++ b/src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactDiffViewer from 'react-diff-viewer';
+import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer';
 import Label from '../../Label';
 import { Props } from '../types';
 
@@ -7,7 +7,7 @@ import './index.scss';
 
 const baseClass = 'text-diff';
 
-const Text: React.FC<Props> = ({ field, locale, version, comparison, isRichText = false }) => {
+const Text: React.FC<Props> = ({ field, locale, version, comparison, isRichText = false, diffMethod }) => {
   let placeholder = '';
 
   if (version === comparison) placeholder = '[no value]';
@@ -20,7 +20,6 @@ const Text: React.FC<Props> = ({ field, locale, version, comparison, isRichText
     if (typeof comparison === 'object') comparisonToRender = JSON.stringify(comparison, null, 2);
   }
 
-
   return (
     <div className={baseClass}>
       <Label>
@@ -30,6 +29,7 @@ const Text: React.FC<Props> = ({ field, locale, version, comparison, isRichText
         {field.label}
       </Label>
       <ReactDiffViewer
+        compareMethod={DiffMethod[diffMethod]}
         oldValue={typeof versionToRender !== 'undefined' ? String(versionToRender) : placeholder}
         newValue={typeof comparisonToRender !== 'undefined' ? String(comparisonToRender) : placeholder}
         splitView
diff --git a/src/admin/components/views/Version/RenderFieldsToDiff/fields/diffMethods.ts b/src/admin/components/views/Version/RenderFieldsToDiff/fields/diffMethods.ts
new file mode 100644
index 0000000000..c15fb7629d
--- /dev/null
+++ b/src/admin/components/views/Version/RenderFieldsToDiff/fields/diffMethods.ts
@@ -0,0 +1,6 @@
+export const diffMethods = {
+  select: 'WORDS_WITH_SPACE',
+  relationship: 'WORDS_WITH_SPACE',
+  upload: 'WORDS_WITH_SPACE',
+  radio: 'WORDS_WITH_SPACE',
+};
diff --git a/src/admin/components/views/Version/RenderFieldsToDiff/fields/types.ts b/src/admin/components/views/Version/RenderFieldsToDiff/fields/types.ts
index 02d93d56fc..37b174ec13 100644
--- a/src/admin/components/views/Version/RenderFieldsToDiff/fields/types.ts
+++ b/src/admin/components/views/Version/RenderFieldsToDiff/fields/types.ts
@@ -1,9 +1,11 @@
 import React from 'react';
+import { DiffMethod } from 'react-diff-viewer';
 import { FieldPermissions } from '../../../../../../auth';
 
 export type FieldComponents = Record<string, React.FC<Props>>
 
 export type Props = {
+  diffMethod?: DiffMethod
   fieldComponents: FieldComponents
   version: any
   comparison: any
diff --git a/src/admin/components/views/Version/RenderFieldsToDiff/index.tsx b/src/admin/components/views/Version/RenderFieldsToDiff/index.tsx
index 571f9b13bd..f628f35439 100644
--- a/src/admin/components/views/Version/RenderFieldsToDiff/index.tsx
+++ b/src/admin/components/views/Version/RenderFieldsToDiff/index.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
+import { DiffMethod } from 'react-diff-viewer';
 import { Props } from './types';
 import { fieldAffectsData, fieldHasSubFields } from '../../../../../fields/config/types';
 import Nested from './fields/Nested';
 
 import './index.scss';
+import { diffMethods } from './fields/diffMethods';
 
 const baseClass = 'render-field-diffs';
 
@@ -20,6 +22,7 @@ const RenderFieldsToDiff: React.FC<Props> = ({
       const Component = fieldComponents[field.type];
 
       const isRichText = field.type === 'richText';
+      const diffMethod: DiffMethod = diffMethods[field.type] || 'CHARS';
 
       if (Component) {
         if (fieldAffectsData(field)) {
@@ -46,6 +49,7 @@ const RenderFieldsToDiff: React.FC<Props> = ({
                     >
                       <div className={`${baseClass}__locale-value`}>
                         <Component
+                          diffMethod={diffMethod}
                           locale={locale}
                           locales={locales}
                           field={field}
@@ -69,6 +73,7 @@ const RenderFieldsToDiff: React.FC<Props> = ({
               key={i}
             >
               <Component
+                diffMethod={diffMethod}
                 locales={locales}
                 field={field}
                 fieldComponents={fieldComponents}
diff --git a/src/admin/components/views/Version/Version.tsx b/src/admin/components/views/Version/Version.tsx
index 768324a212..ab500a3a08 100644
--- a/src/admin/components/views/Version/Version.tsx
+++ b/src/admin/components/views/Version/Version.tsx
@@ -10,7 +10,7 @@ import { StepNavItem } from '../../elements/StepNav/types';
 import Meta from '../../utilities/Meta';
 import { LocaleOption, CompareOption, Props } from './types';
 import CompareVersion from './Compare';
-import { publishedVersionOption } from './shared';
+import { mostRecentVersionOption } from './shared';
 import Restore from './Restore';
 import SelectLocales from './SelectLocales';
 import RenderFieldsToDiff from './RenderFieldsToDiff';
@@ -27,7 +27,7 @@ const VersionView: React.FC<Props> = ({ collection, global }) => {
   const { serverURL, routes: { admin, api }, admin: { dateFormat }, localization } = useConfig();
   const { setStepNav } = useStepNav();
   const { params: { id, versionID } } = useRouteMatch<{ id?: string, versionID: string }>();
-  const [compareValue, setCompareValue] = useState<CompareOption>(publishedVersionOption);
+  const [compareValue, setCompareValue] = useState<CompareOption>(mostRecentVersionOption);
   const [localeOptions] = useState<LocaleOption[]>(() => (localization?.locales ? localization.locales.map((locale) => ({ label: locale, value: locale })) : []));
   const [locales, setLocales] = useState<LocaleOption[]>(localeOptions);
   const { permissions } = useAuth();
@@ -63,11 +63,12 @@ const VersionView: React.FC<Props> = ({ collection, global }) => {
   }
 
   const useAsTitle = collection?.admin?.useAsTitle || 'id';
-  const compareFetchURL = compareValue?.value === 'published' ? originalDocFetchURL : `${compareBaseURL}/${compareValue.value}`;
+
+  const compareFetchURL = compareValue?.value === 'mostRecent' ? originalDocFetchURL : `${compareBaseURL}/${compareValue.value}`;
 
   const [{ data: doc, isLoading }] = usePayloadAPI(versionFetchURL, { initialParams: { locale: '*', depth: 1 } });
-  const [{ data: originalDoc }] = usePayloadAPI(originalDocFetchURL, { initialParams: { depth: 1 } });
-  const [{ data: compareDoc }] = usePayloadAPI(compareFetchURL, { initialParams: { locale: '*', depth: 1 } });
+  const [{ data: originalDoc }] = usePayloadAPI(originalDocFetchURL, { initialParams: { depth: 1, draft: 'true' } });
+  const [{ data: compareDoc }] = usePayloadAPI(compareFetchURL, { initialParams: { locale: '*', depth: 1, draft: 'true' } });
 
   useEffect(() => {
     let nav: StepNavItem[] = [];
@@ -186,7 +187,7 @@ const VersionView: React.FC<Props> = ({ collection, global }) => {
             fieldComponents={fieldComponents}
             fieldPermissions={fieldPermissions}
             version={doc?.version}
-            comparison={compareValue?.value === 'published' ? compareDoc : compareDoc?.version}
+            comparison={compareValue?.value === 'mostRecent' ? compareDoc : compareDoc?.version}
           />
         )}
       </div>
diff --git a/src/admin/components/views/Version/shared.ts b/src/admin/components/views/Version/shared.ts
index 66a0353621..aa4762a6cd 100644
--- a/src/admin/components/views/Version/shared.ts
+++ b/src/admin/components/views/Version/shared.ts
@@ -1,4 +1,4 @@
-export const publishedVersionOption = {
-  label: 'Most recently published',
-  value: 'published',
+export const mostRecentVersionOption = {
+  label: 'Most recent',
+  value: 'mostRecent',
 };
diff --git a/src/admin/components/views/Versions/columns.tsx b/src/admin/components/views/Versions/columns.tsx
index 86c78b478a..454d7ed531 100644
--- a/src/admin/components/views/Versions/columns.tsx
+++ b/src/admin/components/views/Versions/columns.tsx
@@ -39,12 +39,12 @@ const TextCell: React.FC = ({ children }) => (
 
 export const getColumns = (collection: SanitizedCollectionConfig, global: SanitizedGlobalConfig): Column[] => [
   {
-    accessor: 'createdAt',
+    accessor: 'updatedAt',
     components: {
       Heading: (
         <SortColumn
-          label="Created At"
-          name="createdAt"
+          label="Updated At"
+          name="updatedAt"
         />
       ),
       renderCell: (row, data) => (
@@ -83,10 +83,10 @@ export const getColumns = (collection: SanitizedCollectionConfig, global: Saniti
       renderCell: (row, data) => (
         <TextCell>
           {row?.autosave && (
-          <Pill>
-            Autosave
-          </Pill>
-            )}
+            <Pill>
+              Autosave
+            </Pill>
+          )}
         </TextCell>
       ),
     },
diff --git a/src/admin/components/views/Versions/index.tsx b/src/admin/components/views/Versions/index.tsx
index 9924a4fe24..88670a8ff5 100644
--- a/src/admin/components/views/Versions/index.tsx
+++ b/src/admin/components/views/Versions/index.tsx
@@ -44,7 +44,7 @@ const Versions: React.FC<Props> = ({ collection, global }) => {
   }
 
   const useAsTitle = collection?.admin?.useAsTitle || 'id';
-  const [{ data: doc }] = usePayloadAPI(docURL);
+  const [{ data: doc }] = usePayloadAPI(docURL, { initialParams: { draft: 'true' } });
   const [{ data: versionsData, isLoading: isLoadingVersions }, { setParams }] = usePayloadAPI(fetchURL);
 
   useEffect(() => {
diff --git a/src/admin/components/views/collections/Edit/Default.tsx b/src/admin/components/views/collections/Edit/Default.tsx
index 2e66db0106..b1566f8dae 100644
--- a/src/admin/components/views/collections/Edit/Default.tsx
+++ b/src/admin/components/views/collections/Edit/Default.tsx
@@ -20,6 +20,8 @@ import VersionsCount from '../../../elements/VersionsCount';
 import Upload from './Upload';
 import { Props } from './types';
 import Autosave from '../../../elements/Autosave';
+import Select from '../../../forms/field-types/Select';
+import { statuses } from '../../../../../versions/baseFields';
 
 import './index.scss';
 
@@ -159,6 +161,14 @@ const DefaultEditView: React.FC<Props> = (props) => {
               {!isLoading && (
                 <React.Fragment>
                   <div className={`${baseClass}__sidebar-fields`}>
+                    {collection.versions?.drafts && (
+                      <Select
+                        label="Status"
+                        path="_status"
+                        name="_status"
+                        options={statuses}
+                      />
+                    )}
                     {(collection.versions?.drafts && collection.versions.drafts.autosave && hasSavePermission) && (
                       <Autosave
                         updatedAt={data.updatedAt}
diff --git a/src/admin/components/views/collections/Edit/index.tsx b/src/admin/components/views/collections/Edit/index.tsx
index c24f5cc793..8ca951e934 100644
--- a/src/admin/components/views/collections/Edit/index.tsx
+++ b/src/admin/components/views/collections/Edit/index.tsx
@@ -119,7 +119,7 @@ const EditView: React.FC<IndexProps> = (props) => {
   const collectionPermissions = permissions?.collections?.[slug];
 
   const apiURL = `${serverURL}${api}/${slug}/${id}${collection.versions.drafts ? '?draft=true' : ''}`;
-  const action = `${serverURL}${api}/${slug}${isEditing ? `/${id}` : ''}?locale=${locale}&depth=0&fallback-locale=null&draft=true`;
+  const action = `${serverURL}${api}/${slug}${isEditing ? `/${id}` : ''}?locale=${locale}&depth=0&fallback-locale=null`;
   const hasSavePermission = (isEditing && collectionPermissions?.update?.permission) || (!isEditing && collectionPermissions?.create?.permission);
 
   return (
diff --git a/src/collections/operations/create.ts b/src/collections/operations/create.ts
index 2d7f4b2823..df0dc85ff8 100644
--- a/src/collections/operations/create.ts
+++ b/src/collections/operations/create.ts
@@ -91,7 +91,7 @@ async function create(this: Payload, incomingArgs: Arguments): Promise<Document>
     collection,
     req,
     data,
-    throwOnMissingFile: false,
+    throwOnMissingFile: !shouldSaveDraft,
     overwriteExistingFiles,
   });
 
diff --git a/src/collections/operations/find.ts b/src/collections/operations/find.ts
index 65900228f7..9f1fd7e2a1 100644
--- a/src/collections/operations/find.ts
+++ b/src/collections/operations/find.ts
@@ -70,12 +70,9 @@ async function find<T extends TypeWithID = any>(incomingArgs: Arguments): Promis
   let useEstimatedCount = false;
 
   if (where) {
-    if (Array.isArray(where.and)) {
-      queryToBuild.where.and = [
-        ...queryToBuild.where.and,
-        ...where.and,
-      ];
-    }
+    queryToBuild.where = {
+      ...where,
+    };
 
     if (Array.isArray(where.AND)) {
       queryToBuild.where.and = [
diff --git a/src/collections/operations/findVersions.ts b/src/collections/operations/findVersions.ts
index acc3df70f6..3432092440 100644
--- a/src/collections/operations/findVersions.ts
+++ b/src/collections/operations/findVersions.ts
@@ -88,7 +88,7 @@ async function findVersions<T extends TypeWithVersion<T> = any>(this: Payload, a
   // Find
   // /////////////////////////////////////
 
-  const [sortProperty, sortOrder] = buildSortParam(args.sort, collectionConfig.timestamps);
+  const [sortProperty, sortOrder] = buildSortParam(args.sort || '-updatedAt', true);
 
   const optionsToExecute = {
     page: page || 1,
diff --git a/src/collections/operations/update.ts b/src/collections/operations/update.ts
index 0724641473..2cfd660b6b 100644
--- a/src/collections/operations/update.ts
+++ b/src/collections/operations/update.ts
@@ -235,17 +235,18 @@ async function update(this: Payload, incomingArgs: Arguments): Promise<Document>
 
     // custom id type reset
     result.id = result._id;
-    result = JSON.stringify(result);
-    result = JSON.parse(result);
-    result = sanitizeInternalFields(result);
   }
 
+  result = JSON.stringify(result);
+  result = JSON.parse(result);
+  result = sanitizeInternalFields(result);
+
   // /////////////////////////////////////
   // Create version from existing doc
   // /////////////////////////////////////
 
   if (collectionConfig.versions && !shouldSaveDraft) {
-    result = saveCollectionVersion({
+    saveCollectionVersion({
       payload: this,
       config: collectionConfig,
       req,
diff --git a/src/globals/operations/findVersions.ts b/src/globals/operations/findVersions.ts
index f9a3394c03..f208d23199 100644
--- a/src/globals/operations/findVersions.ts
+++ b/src/globals/operations/findVersions.ts
@@ -85,7 +85,7 @@ async function findVersions<T extends TypeWithVersion<T> = any>(args: Arguments)
   // Find
   // /////////////////////////////////////
 
-  const [sortProperty, sortOrder] = buildSortParam(args.sort, true);
+  const [sortProperty, sortOrder] = buildSortParam(args.sort || '-updatedAt', true);
 
   const optionsToExecute = {
     page: page || 1,
diff --git a/src/versions/drafts/saveCollectionDraft.ts b/src/versions/drafts/saveCollectionDraft.ts
index 47ec09e866..06d3cddbb5 100644
--- a/src/versions/drafts/saveCollectionDraft.ts
+++ b/src/versions/drafts/saveCollectionDraft.ts
@@ -21,7 +21,7 @@ export const saveCollectionDraft = async ({
 
   const existingAutosaveVersion = await VersionsModel.findOne({
     parent: id,
-  });
+  }, {}, { sort: { updatedAt: 'desc' } });
 
   let result;
 
diff --git a/src/versions/saveCollectionVersion.ts b/src/versions/saveCollectionVersion.ts
index 5af2b7ec19..8f0661f0b1 100644
--- a/src/versions/saveCollectionVersion.ts
+++ b/src/versions/saveCollectionVersion.ts
@@ -2,7 +2,6 @@ import { Payload } from '..';
 import { SanitizedCollectionConfig } from '../collections/config/types';
 import { enforceMaxVersions } from './enforceMaxVersions';
 import { PayloadRequest } from '../express/types';
-import sanitizeInternalFields from '../utilities/sanitizeInternalFields';
 
 type Args = {
   payload: Payload
@@ -34,10 +33,9 @@ export const saveCollectionVersion = async ({
   });
 
   delete version._id;
-  let result;
 
   try {
-    result = await VersionsModel.create({
+    await VersionsModel.create({
       parent: id,
       version,
       autosave: false,
@@ -57,10 +55,4 @@ export const saveCollectionVersion = async ({
       maxPerDoc: config.versions.maxPerDoc,
     });
   }
-
-  result = JSON.stringify(result);
-  result = JSON.parse(result);
-  result = sanitizeInternalFields(result);
-
-  return result;
 };
diff --git a/src/versions/tests/rest.spec.ts b/src/versions/tests/rest.spec.ts
index 04855469d6..c725bc5800 100644
--- a/src/versions/tests/rest.spec.ts
+++ b/src/versions/tests/rest.spec.ts
@@ -32,11 +32,10 @@ describe('Versions - REST', () => {
       'Content-Type': 'application/json',
     };
 
-    const post = await fetch(`${url}/api/localized-posts`, {
+    const post = await fetch(`${url}/api/autosave-posts`, {
       body: JSON.stringify({
-        title: 'Here is a localized post in EN',
+        title: 'Here is an autosave post in EN',
         description: '345j23o4ifj34jf54g',
-        priority: 10,
       }),
       headers,
       method: 'post',
@@ -51,7 +50,7 @@ describe('Versions - REST', () => {
     it('should allow a new version to be created', async () => {
       const title2 = 'Here is an updated post title in EN';
 
-      const updatedPost = await fetch(`${url}/api/localized-posts/${postID}`, {
+      const updatedPost = await fetch(`${url}/api/autosave-posts/${postID}`, {
         body: JSON.stringify({
           title: title2,
         }),
@@ -60,8 +59,9 @@ describe('Versions - REST', () => {
       }).then((res) => res.json());
 
       expect(updatedPost.doc.title).toBe(title2);
+      expect(updatedPost.doc._status).toStrictEqual('draft');
 
-      const versions = await fetch(`${url}/api/localized-posts/versions`, {
+      const versions = await fetch(`${url}/api/autosave-posts/versions`, {
         headers,
       }).then((res) => res.json());
 
@@ -69,7 +69,7 @@ describe('Versions - REST', () => {
     });
 
     it('should allow a version to be retrieved by ID', async () => {
-      const version = await fetch(`${url}/api/localized-posts/versions/${versionID}`, {
+      const version = await fetch(`${url}/api/autosave-posts/versions/${versionID}`, {
         headers,
       }).then((res) => res.json());
 
@@ -80,7 +80,7 @@ describe('Versions - REST', () => {
       const englishTitle = 'Title in ES';
       const spanishTitle = 'Title in ES';
 
-      await fetch(`${url}/api/localized-posts/${postID}`, {
+      await fetch(`${url}/api/autosave-posts/${postID}`, {
         body: JSON.stringify({
           title: englishTitle,
         }),
@@ -88,7 +88,7 @@ describe('Versions - REST', () => {
         method: 'put',
       }).then((res) => res.json());
 
-      const updatedPostES = await fetch(`${url}/api/localized-posts/${postID}?locale=es`, {
+      const updatedPostES = await fetch(`${url}/api/autosave-posts/${postID}?locale=es`, {
         body: JSON.stringify({
           title: spanishTitle,
         }),
@@ -100,7 +100,7 @@ describe('Versions - REST', () => {
 
       const newEnglishTitle = 'New title in EN';
 
-      await fetch(`${url}/api/localized-posts/${postID}`, {
+      await fetch(`${url}/api/autosave-posts/${postID}`, {
         body: JSON.stringify({
           title: newEnglishTitle,
         }),
@@ -108,7 +108,7 @@ describe('Versions - REST', () => {
         method: 'put',
       }).then((res) => res.json());
 
-      const versions = await fetch(`${url}/api/localized-posts/versions?locale=all`, {
+      const versions = await fetch(`${url}/api/autosave-posts/versions?locale=all`, {
         headers,
       }).then((res) => res.json());
 
@@ -121,7 +121,7 @@ describe('Versions - REST', () => {
     it('should allow a version to be restored', async () => {
       const title2 = 'Here is an updated post title in EN';
 
-      const updatedPost = await fetch(`${url}/api/localized-posts/${postID}`, {
+      const updatedPost = await fetch(`${url}/api/autosave-posts/${postID}`, {
         body: JSON.stringify({
           title: title2,
         }),
@@ -131,13 +131,13 @@ describe('Versions - REST', () => {
 
       expect(updatedPost.doc.title).toBe(title2);
 
-      const versions = await fetch(`${url}/api/localized-posts/versions`, {
+      const versions = await fetch(`${url}/api/autosave-posts/versions`, {
         headers,
       }).then((res) => res.json());
 
       versionID = versions.docs[0].id;
 
-      const restore = await fetch(`${url}/api/localized-posts/versions/${versionID}`, {
+      const restore = await fetch(`${url}/api/autosave-posts/versions/${versionID}`, {
         headers,
         method: 'post',
       }).then((res) => res.json());
@@ -145,7 +145,7 @@ describe('Versions - REST', () => {
       expect(restore.message).toBeDefined();
       expect(restore.doc.title).toBeDefined();
 
-      const restoredPost = await fetch(`${url}/api/localized-posts/${postID}`, {
+      const restoredPost = await fetch(`${url}/api/autosave-posts/${postID}`, {
         headers,
       }).then((res) => res.json());