diff --git a/services/app-web/src/components/FileUpload/FileItemList/__snapshots__/FileItemsList.test.tsx.snap b/services/app-web/src/components/FileUpload/FileItemList/__snapshots__/FileItemsList.test.tsx.snap
index abcd4ed1ce..6cc8e16a33 100644
--- a/services/app-web/src/components/FileUpload/FileItemList/__snapshots__/FileItemsList.test.tsx.snap
+++ b/services/app-web/src/components/FileUpload/FileItemList/__snapshots__/FileItemsList.test.tsx.snap
@@ -193,7 +193,7 @@ exports[`FileItemList component renders correctly 1`] = `
     >
       <div
         aria-label="Status of file testFile4.pdf"
-        aria-valuetext=""
+        aria-valuetext="upload complete"
         role="progressbar"
       >
         <img
diff --git a/services/app-web/src/components/FileUpload/FileProcessor/FileProcessor.tsx b/services/app-web/src/components/FileUpload/FileProcessor/FileProcessor.tsx
index 7983166781..b9e9dbdbea 100644
--- a/services/app-web/src/components/FileUpload/FileProcessor/FileProcessor.tsx
+++ b/services/app-web/src/components/FileUpload/FileProcessor/FileProcessor.tsx
@@ -116,6 +116,7 @@ export const FileProcessor = ({
         !isContractOnly && item.documentCategories.length === 0
     const isLoading = status === 'PENDING'
     const isScanning = status === 'SCANNING'
+    const isComplete = status === 'UPLOAD_COMPLETE'
 
     const isPDF = name.indexOf('.pdf') > 0
     const isWord = name.indexOf('.doc') > 0 || name.indexOf('.pages') > 0
@@ -145,6 +146,8 @@ export const FileProcessor = ({
         statusValue = 'uploading'
     } else if (isScanning) {
         statusValue = 'scanning for viruses'
+    } else if (isComplete){
+        statusValue = 'upload complete'
     } else if (
         hasDuplicateNameError ||
         hasScanningError ||
diff --git a/services/app-web/src/components/FileUpload/FileUpload.tsx b/services/app-web/src/components/FileUpload/FileUpload.tsx
index 4ed7c484a4..0070d1f9f7 100644
--- a/services/app-web/src/components/FileUpload/FileUpload.tsx
+++ b/services/app-web/src/components/FileUpload/FileUpload.tsx
@@ -406,6 +406,7 @@ export const FileUpload = ({
             {hint && (
                 <span
                     id={`${id}-hint`}
+                    role="note"
                     aria-labelledby={id}
                     className={styles.fileInputHint}
                 >
diff --git a/services/app-web/src/components/Form/FieldDropdown/FieldDropdown.tsx b/services/app-web/src/components/Form/FieldDropdown/FieldDropdown.tsx
index 94a608e29c..f6b95dcfed 100644
--- a/services/app-web/src/components/Form/FieldDropdown/FieldDropdown.tsx
+++ b/services/app-web/src/components/Form/FieldDropdown/FieldDropdown.tsx
@@ -49,7 +49,7 @@ export const FieldDropdown = ({
                 <PoliteErrorMessage>{meta.error}</PoliteErrorMessage>
             )}
             {hint && (
-                <div aria-labelledby={id} className="usa-hint margin-top-1">
+                <div role="note" aria-labelledby={id} className="usa-hint margin-top-1">
                     {hint}
                 </div>
             )}
diff --git a/services/app-web/src/components/Form/FieldTextInput/FieldTextInput.tsx b/services/app-web/src/components/Form/FieldTextInput/FieldTextInput.tsx
index c31765b403..c2fe57ca84 100644
--- a/services/app-web/src/components/Form/FieldTextInput/FieldTextInput.tsx
+++ b/services/app-web/src/components/Form/FieldTextInput/FieldTextInput.tsx
@@ -44,7 +44,7 @@ export const FieldTextInput = ({
                 <PoliteErrorMessage>{meta.error}</PoliteErrorMessage>
             )}
             {hint && (
-                <div aria-labelledby={id} className="usa-hint margin-top-1">
+                <div role="note" aria-labelledby={id} className="usa-hint margin-top-1">
                     {hint}
                 </div>
             )}
diff --git a/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.tsx b/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.tsx
index fef64fcbc2..658a0303a5 100644
--- a/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.tsx
+++ b/services/app-web/src/components/Form/FieldTextarea/FieldTextarea.tsx
@@ -42,7 +42,7 @@ export const FieldTextarea = ({
                 <PoliteErrorMessage>{meta.error}</PoliteErrorMessage>
             )}
             {hint && (
-                <div aria-labelledby={id} className="usa-hint margin-top-1">
+                <div role="note" aria-labelledby={id} className="usa-hint margin-top-1">
                     {hint}
                 </div>
             )}
diff --git a/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.tsx b/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.tsx
index bf87194a71..5ef5bc2f0f 100644
--- a/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.tsx
+++ b/services/app-web/src/pages/StateSubmission/ContractDetails/ContractDetails.tsx
@@ -444,6 +444,7 @@ export const ContractDetails = ({
                                 error={showFieldErrors(errors.contractType)}
                             >
                                 <Fieldset
+                                    role="radiogroup"
                                     aria-required
                                     className={styles.radioGroup}
                                     legend="Contract action type"
@@ -477,6 +478,7 @@ export const ContractDetails = ({
                                 error={showFieldErrors(errors.contractExecutionStatus)}
                             >
                                 <Fieldset
+                                    role="radiogroup"
                                     aria-required
                                     className={styles.radioGroup}
                                     legend="Contract status"
@@ -847,6 +849,7 @@ export const ContractDetails = ({
                                                                 }
                                                             >
                                                                 <Fieldset
+                                                                    role="radiogroup"
                                                                     aria-required
                                                                     legend="Select reason for capitation rate change"
                                                                 >
@@ -1078,6 +1081,7 @@ export const ContractDetails = ({
                                                         )}
                                                     >
                                                         <Fieldset
+                                                            role="radiogroup"
                                                             aria-required
                                                             legend="Is this contract action related to the COVID-19 public health emergency?"
                                                         >
@@ -1120,6 +1124,7 @@ export const ContractDetails = ({
                                                             )}
                                                         >
                                                             <Fieldset
+                                                                role="radiogroup"
                                                                 aria-required
                                                                 legend="Is this related to coverage and reimbursement for vaccine administration?"
                                                             >
diff --git a/services/app-web/src/pages/StateSubmission/RateDetails/RateDetails.tsx b/services/app-web/src/pages/StateSubmission/RateDetails/RateDetails.tsx
index 6415e08bf7..c2d915e3e9 100644
--- a/services/app-web/src/pages/StateSubmission/RateDetails/RateDetails.tsx
+++ b/services/app-web/src/pages/StateSubmission/RateDetails/RateDetails.tsx
@@ -389,6 +389,7 @@ export const RateDetails = ({
                                     <Fieldset
                                         className={styles.radioGroup}
                                         legend="Rate certification type"
+                                        role="radiogroup"
                                         aria-required
                                     >
                                         {showFieldErrors(errors.rateType) && (
diff --git a/services/app-web/src/pages/StateSubmission/SubmissionType/SubmissionType.tsx b/services/app-web/src/pages/StateSubmission/SubmissionType/SubmissionType.tsx
index 22a4495fe7..39d92fc418 100644
--- a/services/app-web/src/pages/StateSubmission/SubmissionType/SubmissionType.tsx
+++ b/services/app-web/src/pages/StateSubmission/SubmissionType/SubmissionType.tsx
@@ -326,6 +326,7 @@ export const SubmissionType = ({
                             >
                                 <Fieldset
                                     className={styles.radioGroup}
+                                    role="radiogroup"
                                     aria-required
                                     legend="Choose submission type"
                                 >
@@ -375,7 +376,6 @@ export const SubmissionType = ({
                                 )}
                                 hint={
                                     <>
-
                                         <p id="submissionDescriptionHelp">
                                             Provide a 1-2 paragraph summary of your submission that highlights any important changes CMS reviewers will need to be aware of
                                         </p>
diff --git a/tests/cypress/integration/stateWorkflow/dashboard/dashboard.spec.ts b/tests/cypress/integration/stateWorkflow/dashboard/dashboard.spec.ts
index 14a8f077c6..667d7bcdd5 100644
--- a/tests/cypress/integration/stateWorkflow/dashboard/dashboard.spec.ts
+++ b/tests/cypress/integration/stateWorkflow/dashboard/dashboard.spec.ts
@@ -16,7 +16,6 @@ describe('dashboard', () => {
         // check accessibility of dashboard
         cy.pa11y({
             actions: ['wait for element #dashboard-page to be visible'],
-            threshold: 2, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15947
         })
     })
 
@@ -55,7 +54,11 @@ describe('dashboard', () => {
         cy.findByRole('heading', { level: 2, name: /Review and submit/ })
         cy.pa11y({
             actions: ['wait for element #submissionTypeSection to be visible'],
-            threshold: 24, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15950
+            ignore: [
+                'definition-list',
+                'dlitem',
+            ],
+            hideElements: '.usa-step-indicator'
         })
 
         // Submit, sent to dashboard
@@ -104,7 +107,10 @@ describe('dashboard', () => {
                 actions: [
                     'wait for element #submissionTypeSection to be visible',
                 ],
-                threshold: 20, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15952
+                ignore: [
+                    'definition-list',
+                    'dlitem',
+                ],
             })
 
             // Link back to dashboard, submission visible in default program
diff --git a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contacts.spec.ts b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contacts.spec.ts
index 00b35d06e3..fc4ebf6dcf 100644
--- a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contacts.spec.ts
+++ b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contacts.spec.ts
@@ -49,7 +49,7 @@ describe('contacts', () => {
             cy.findByRole('heading', { name: /Contacts/ })
             cy.pa11y({
                 actions: ['wait for element #form-guidance to be visible'],
-                threshold: 7, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15948
+                hideElements: '.usa-step-indicator',
             })
         })
     })
diff --git a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contractDetails.spec.ts b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contractDetails.spec.ts
index 6ef2578a22..2fe8bff703 100644
--- a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contractDetails.spec.ts
+++ b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/contractDetails.spec.ts
@@ -57,7 +57,8 @@ describe('contract details', () => {
         cy.findByRole('button', { name: /Back/ }).click()
         cy.pa11y({
             actions: ['wait for element #form-guidance to be visible'],
-            threshold: 16, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15946
+            hideElements: '.usa-step-indicator',
+            threshold: 6,
         })
     })
 })
diff --git a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/documents.spec.ts b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/documents.spec.ts
index 864461c51b..6bc6284759 100644
--- a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/documents.spec.ts
+++ b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/documents.spec.ts
@@ -129,7 +129,7 @@ describe('documents', () => {
             cy.findByRole('button', { name: /Back/ }).click()
             cy.pa11y({
                 actions: ['wait for element #documents-hint to be visible'],
-                threshold: 9, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15949
+                hideElements: '.usa-step-indicator',
             })
         })
     })
diff --git a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/newSubmission.spec.ts b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/newSubmission.spec.ts
index e50d1cff84..18135c20e8 100644
--- a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/newSubmission.spec.ts
+++ b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/newSubmission.spec.ts
@@ -22,7 +22,7 @@ describe('new submission', () => {
         cy.findByRole('button', { name: /Back/ }).click()
         cy.pa11y({
             actions: ['wait for element #form-guidance to be visible'],
-            threshold: 9, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15931
+            hideElements: '.usa-step-indicator',
         })
     })
 })
diff --git a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/rateDetails.spec.ts b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/rateDetails.spec.ts
index 76cc212f13..14ddf74521 100644
--- a/tests/cypress/integration/stateWorkflow/stateSubmissionForm/rateDetails.spec.ts
+++ b/tests/cypress/integration/stateWorkflow/stateSubmissionForm/rateDetails.spec.ts
@@ -53,7 +53,8 @@ describe('rate details', () => {
             cy.findByRole('button', { name: /Back/ }).click()
             cy.pa11y({
                 actions: ['wait for element #form-guidance to be visible'],
-                threshold: 12, // This ratchet is tracked by https://qmacbis.atlassian.net/browse/OY2-15947
+                hideElements: '.usa-step-indicator',
+                threshold: 4,
             })
         })
     })