diff --git a/services/ui-src/src/config.ts b/services/ui-src/src/config.ts
index d02d68c413..5d429e925c 100644
--- a/services/ui-src/src/config.ts
+++ b/services/ui-src/src/config.ts
@@ -32,7 +32,7 @@ const configToExport = {
     REDIRECT_SIGNOUT: window._env_.COGNITO_REDIRECT_SIGNOUT,
   },
   POST_SIGNOUT_REDIRECT: window._env_.POST_SIGNOUT_REDIRECT,
-  currentReportingYear: "2021",
+  currentReportingYear: "2023",
   REACT_APP_LD_SDK_CLIENT: window._env_.REACT_APP_LD_SDK_CLIENT,
 };
 
diff --git a/services/ui-src/src/views/AdminHome/index.tsx b/services/ui-src/src/views/AdminHome/index.tsx
index 04a5a77404..5af947d208 100644
--- a/services/ui-src/src/views/AdminHome/index.tsx
+++ b/services/ui-src/src/views/AdminHome/index.tsx
@@ -3,9 +3,13 @@ import * as CUI from "@chakra-ui/react";
 import { stateAbbreviations } from "utils/constants";
 import { useNavigate } from "react-router";
 import config from "config";
+import { useFlags } from "launchdarkly-react-client-sdk";
 
 export const AdminHome = () => {
   const [locality, setLocality] = useState("AL");
+  const releaseYearByFlag = useFlags()?.["release2023"]
+    ? config.currentReportingYear
+    : parseInt(config.currentReportingYear) - 1;
   const navigate = useNavigate();
   return (
     <CUI.Container maxW="7xl" py="4">
@@ -26,9 +30,7 @@ export const AdminHome = () => {
         </CUI.Select>
         <CUI.Button
           colorScheme="blue"
-          onClick={() =>
-            navigate(`/${locality}/${config.currentReportingYear}`)
-          }
+          onClick={() => navigate(`/${locality}/${releaseYearByFlag}`)}
           isFullWidth
           data-cy="Go To State Home"
         >
diff --git a/services/ui-src/src/views/Home/index.tsx b/services/ui-src/src/views/Home/index.tsx
index b07a9efab8..f02413f681 100644
--- a/services/ui-src/src/views/Home/index.tsx
+++ b/services/ui-src/src/views/Home/index.tsx
@@ -5,9 +5,13 @@ import * as CUI from "@chakra-ui/react";
 import "./index.module.scss";
 import * as QMR from "components";
 import { useUser } from "hooks/authHooks";
+import { useFlags } from "launchdarkly-react-client-sdk";
 
 export function Home() {
   const { userRole, userState } = useUser();
+  const releaseYearByFlag = useFlags()?.["release2023"]
+    ? config.currentReportingYear
+    : parseInt(config.currentReportingYear) - 1;
   if (
     userRole === UserRoles.HELP ||
     userRole === UserRoles.ADMIN ||
@@ -27,5 +31,5 @@ export function Home() {
       </CUI.Box>
     );
   }
-  return <Navigate to={`/${userState}/${config.currentReportingYear}`} />;
+  return <Navigate to={`/${userState}/${releaseYearByFlag}`} />;
 }
diff --git a/tests/cypress/cypress/integration/a11y/ADDCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/ADDCHpage.spec.ts
index 6c19ae3c31..9e42d27a56 100644
--- a/tests/cypress/cypress/integration/a11y/ADDCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ADDCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("ADD-CH Page 508 Compliance Test", () => {
   it("Check a11y on ADD-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("ADD-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/AMBCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/AMBCHpage.spec.ts
index dbf3630de0..163126af37 100644
--- a/tests/cypress/cypress/integration/a11y/AMBCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/AMBCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("AMB-CH Page 508 Compliance Test", () => {
   it("Check a11y on AMB-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("AMB-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/AMRCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/AMRCHpage.spec.ts
index dc631176a4..9bec04e94d 100644
--- a/tests/cypress/cypress/integration/a11y/AMRCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/AMRCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("AMR-CH Page 508 Compliance Test", () => {
   it("Check a11y on AMR-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("AMR-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/APMCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/APMCHpage.spec.ts
index f9ec2b32e2..29a8e690d1 100644
--- a/tests/cypress/cypress/integration/a11y/APMCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/APMCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("APM-CH Page 508 Compliance Test", () => {
   it("Check a11y on APM-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("APM-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/APPCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/APPCHpage.spec.ts
index 1492d17213..1266bd174e 100644
--- a/tests/cypress/cypress/integration/a11y/APPCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/APPCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("APP-CH Page 508 Compliance Test", () => {
   it("Check a11y on APP-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("APP-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/AUDCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/AUDCHpage.spec.ts
index 7ad8274058..f5db1aa766 100644
--- a/tests/cypress/cypress/integration/a11y/AUDCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/AUDCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("AUD-CH Page 508 Compliance Test", () => {
   it("Check a11y on AUD-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("AUD-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/CCPCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/CCPCHpage.spec.ts
index d059dcb178..253ced6630 100644
--- a/tests/cypress/cypress/integration/a11y/CCPCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/CCPCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("CCP-CH Page 508 Compliance Test", () => {
   it("Check a11y on CCP-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CCP-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/CCWCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/CCWCHpage.spec.ts
index e046ba3e12..6477825156 100644
--- a/tests/cypress/cypress/integration/a11y/CCWCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/CCWCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("CCW-CH Page 508 Compliance Test", () => {
   it("Check a11y on CCW-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CCW-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/CDFCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/CDFCHpage.spec.ts
index cee366c762..1216b8da6d 100644
--- a/tests/cypress/cypress/integration/a11y/CDFCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/CDFCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("CDF-CH Page 508 Compliance Test", () => {
   it("Check a11y on CDF-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CDF-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/CHLCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/CHLCHpage.spec.ts
index 84c043a304..8e986b321c 100644
--- a/tests/cypress/cypress/integration/a11y/CHLCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/CHLCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("CHL-CH Page 508 Compliance Test", () => {
   it("Check a11y on CHL-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CHL-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/CISCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/CISCHpage.spec.ts
index 9d1cfee765..94fd49f302 100644
--- a/tests/cypress/cypress/integration/a11y/CISCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/CISCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("CIS-CH Page 508 Compliance Test", () => {
   it("Check a11y on CIS-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CIS-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/CPCCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/CPCCHpage.spec.ts
index b74eda7b03..8ad1b234cc 100644
--- a/tests/cypress/cypress/integration/a11y/CPCCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/CPCCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("CPC-CH Page 508 Compliance Test", () => {
   it("Check a11y on CPC-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CPC-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/DEVCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/DEVCHpage.spec.ts
index f3646f50cf..ad7f69f415 100644
--- a/tests/cypress/cypress/integration/a11y/DEVCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/DEVCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("DEV-CH Page 508 Compliance Test", () => {
   it("Check a11y on DEV-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("DEV-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/FUHCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/FUHCHpage.spec.ts
index 55c726cd74..a6a439cbc9 100644
--- a/tests/cypress/cypress/integration/a11y/FUHCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/FUHCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("FUH-CH Page 508 Compliance Test", () => {
   it("Check a11y on FUH-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("FUH-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/IMACHpage.spec.ts b/tests/cypress/cypress/integration/a11y/IMACHpage.spec.ts
index 8b9e9dc8b3..4cb42a73c3 100644
--- a/tests/cypress/cypress/integration/a11y/IMACHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/IMACHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("IMA-CH Page 508 Compliance Test", () => {
   it("Check a11y on IMA-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("IMA-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/LBWCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/LBWCHpage.spec.ts
index bb5f746db7..1cf9fcd92a 100644
--- a/tests/cypress/cypress/integration/a11y/LBWCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/LBWCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("LBW-CH Page 508 Compliance Test", () => {
   it("Check a11y on LBW-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("LBW-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/LRCDCH.spec.ts b/tests/cypress/cypress/integration/a11y/LRCDCH.spec.ts
index 3cdd4a0587..1067937e6f 100644
--- a/tests/cypress/cypress/integration/a11y/LRCDCH.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/LRCDCH.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("LRCD-CH Page 508 Compliance Test", () => {
   it("Check a11y on LRCD-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("LRCD-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/PDENTpage.spec.ts b/tests/cypress/cypress/integration/a11y/PDENTpage.spec.ts
index c5f462e39c..e22bfd9e37 100644
--- a/tests/cypress/cypress/integration/a11y/PDENTpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/PDENTpage.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("PDENT-CH Page 508 Compliance Test", () => {
   it("Check a11y on PDENT-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("PDENT-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/PPCCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/PPCCHpage.spec.ts
index da2b4d76e0..f2a61e6557 100644
--- a/tests/cypress/cypress/integration/a11y/PPCCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/PPCCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("PPC-CH Page 508 Compliance Test", () => {
   it("Check a11y on PPC-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("PPC-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/SFMCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/SFMCHpage.spec.ts
index da5c5f5d59..409ca4ce99 100644
--- a/tests/cypress/cypress/integration/a11y/SFMCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/SFMCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("SFM-CH Page 508 Compliance Test", () => {
   it("Check a11y on SFM-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("SFM-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/W30CHpage.spec.ts b/tests/cypress/cypress/integration/a11y/W30CHpage.spec.ts
index e01a641fb3..e6ef785251 100644
--- a/tests/cypress/cypress/integration/a11y/W30CHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/W30CHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("W30-CH Page 508 Compliance Test", () => {
   it("Check a11y on W30-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("W30-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/WCCCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/WCCCHpage.spec.ts
index 0760a995c8..916d706fee 100644
--- a/tests/cypress/cypress/integration/a11y/WCCCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/WCCCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("WCC-CH Page 508 Compliance Test", () => {
   it("Check a11y on WCC-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("WCC-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/WCVCHpage.spec.ts b/tests/cypress/cypress/integration/a11y/WCVCHpage.spec.ts
index 831c2b59e8..e27c40b701 100644
--- a/tests/cypress/cypress/integration/a11y/WCVCHpage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/WCVCHpage.spec.ts
@@ -1,6 +1,7 @@
 describe("WCV-CH Page 508 Compliance Test", () => {
   it("Check a11y on WCV-CH Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("WCV-CH");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ammadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ammadPage.spec.ts
index fc1e7d5c99..f105208ccc 100644
--- a/tests/cypress/cypress/integration/a11y/ammadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ammadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("AMM-AD Page 508 Compliance Test", () => {
   it("Check a11y on AMMAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("AMM-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/amradPage.spec.ts b/tests/cypress/cypress/integration/a11y/amradPage.spec.ts
index caf9367aac..49c7652921 100644
--- a/tests/cypress/cypress/integration/a11y/amradPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/amradPage.spec.ts
@@ -1,6 +1,7 @@
 describe("AMR-AD Page 508 Compliance Test", () => {
   it("Check a11y on AMRAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("AMR-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/bcsadPage.spec.ts b/tests/cypress/cypress/integration/a11y/bcsadPage.spec.ts
index dfab3ef087..ea39d5b229 100644
--- a/tests/cypress/cypress/integration/a11y/bcsadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/bcsadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("BCS-AD Page 508 Compliance Test", () => {
   it("Check a11y on BCSAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("BCS-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/cbpadPage.spec.ts b/tests/cypress/cypress/integration/a11y/cbpadPage.spec.ts
index b89e20efe7..644b2ad9cf 100644
--- a/tests/cypress/cypress/integration/a11y/cbpadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/cbpadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CBP-AD Page 508 Compliance Test", () => {
   it("Check a11y on CBPAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CBP-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ccpadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ccpadPage.spec.ts
index b4c68ebee6..485f829790 100644
--- a/tests/cypress/cypress/integration/a11y/ccpadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ccpadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CCP-AD Page 508 Compliance Test", () => {
   it("Check a11y on CCPAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCP-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ccsadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ccsadPage.spec.ts
index 4d78400428..f532f42183 100644
--- a/tests/cypress/cypress/integration/a11y/ccsadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ccsadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CCS-AD Page 508 Compliance Test", () => {
   it("Check a11y on CCSAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCS-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ccwadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ccwadPage.spec.ts
index 8747ba4c7a..78c1a3de47 100644
--- a/tests/cypress/cypress/integration/a11y/ccwadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ccwadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CCW-AD Page 508 Compliance Test", () => {
   it("Check a11y on CCWAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCW-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/cdfadPage.spec.ts b/tests/cypress/cypress/integration/a11y/cdfadPage.spec.ts
index 23089ce6bb..5f7b845d52 100644
--- a/tests/cypress/cypress/integration/a11y/cdfadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/cdfadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CDF-AD Page 508 Compliance Test", () => {
   it("Check a11y on CDFAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CDF-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/chladPage.spec.ts b/tests/cypress/cypress/integration/a11y/chladPage.spec.ts
index a27ecc391e..bd0843ab56 100644
--- a/tests/cypress/cypress/integration/a11y/chladPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/chladPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CHL-AD Page 508 Compliance Test", () => {
   it("Check a11y on CHLAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CHL-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/cobadPage.spec.ts b/tests/cypress/cypress/integration/a11y/cobadPage.spec.ts
index dad720be18..fa9fe4b80a 100644
--- a/tests/cypress/cypress/integration/a11y/cobadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/cobadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("COB-AD Page 508 Compliance Test", () => {
   it("Check a11y on COBAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("COB-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/commonPages.spec.ts b/tests/cypress/cypress/integration/a11y/commonPages.spec.ts
index 5b3b76033a..fb9e657fb8 100644
--- a/tests/cypress/cypress/integration/a11y/commonPages.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/commonPages.spec.ts
@@ -1,6 +1,7 @@
 describe("Check A11y on Common Pages", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
   });
 
   it("Check a11y on Home Page", () => {
diff --git a/tests/cypress/cypress/integration/a11y/cpaadPage.spec.ts b/tests/cypress/cypress/integration/a11y/cpaadPage.spec.ts
index b5ad78f3d3..ba7e67b654 100644
--- a/tests/cypress/cypress/integration/a11y/cpaadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/cpaadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("CPA-AD Page 508 Compliance Test", () => {
   it("Check a11y on CPAAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CPA-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/fuadPage.spec.ts b/tests/cypress/cypress/integration/a11y/fuadPage.spec.ts
index 37e7da2bd9..27315948aa 100644
--- a/tests/cypress/cypress/integration/a11y/fuadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/fuadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("FUAD Page 508 Compliance Test", () => {
   it("Check a11y on FUAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUA-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/fuhadPage.spec.ts b/tests/cypress/cypress/integration/a11y/fuhadPage.spec.ts
index fd85958484..510e753549 100644
--- a/tests/cypress/cypress/integration/a11y/fuhadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/fuhadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("FUH-AD Page 508 Compliance Test", () => {
   it("Check a11y on FUHAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUH-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/fumadPage.spec.ts b/tests/cypress/cypress/integration/a11y/fumadPage.spec.ts
index d403594d4f..773992ea21 100644
--- a/tests/cypress/cypress/integration/a11y/fumadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/fumadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("FUM-AD Page 508 Compliance Test", () => {
   it("Check a11y on FUMAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUM-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/fvaadPage.spec.ts b/tests/cypress/cypress/integration/a11y/fvaadPage.spec.ts
index 0d84102b6b..2948eca98b 100644
--- a/tests/cypress/cypress/integration/a11y/fvaadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/fvaadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("FVA-AD Page 508 Compliance Test", () => {
   it("Check a11y on FVAAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FVA-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/hpcadPage.spec.ts b/tests/cypress/cypress/integration/a11y/hpcadPage.spec.ts
index 466dd2d306..e14a1ba107 100644
--- a/tests/cypress/cypress/integration/a11y/hpcadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/hpcadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("HPC-AD Page 508 Compliance Test", () => {
   it("Check a11y on HPCAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HPC-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/hpcmiadPage.spec.ts b/tests/cypress/cypress/integration/a11y/hpcmiadPage.spec.ts
index a99d58123c..e661b9a7a1 100644
--- a/tests/cypress/cypress/integration/a11y/hpcmiadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/hpcmiadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("HPCMI-AD Page 508 Compliance Test", () => {
   it("Check a11y on HPCMIAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HPCMI-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/hvladPage.spec.ts b/tests/cypress/cypress/integration/a11y/hvladPage.spec.ts
index e68acfea41..04978bda0e 100644
--- a/tests/cypress/cypress/integration/a11y/hvladPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/hvladPage.spec.ts
@@ -1,6 +1,7 @@
 describe("HVL-AD Page 508 Compliance Test", () => {
   it("Check a11y on HVLAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HVL-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ietadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ietadPage.spec.ts
index 9487a40699..d019c82aae 100644
--- a/tests/cypress/cypress/integration/a11y/ietadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ietadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("IETAD Page 508 Compliance Test", () => {
   it("Check a11y on IETAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("IET-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/mscadPage.spec.ts b/tests/cypress/cypress/integration/a11y/mscadPage.spec.ts
index 672326d1fa..f890c00cdb 100644
--- a/tests/cypress/cypress/integration/a11y/mscadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/mscadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("MSC-AD Page 508 Compliance Test", () => {
   it("Check a11y on MSCAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("MSC-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/nciddsPage.spec.ts b/tests/cypress/cypress/integration/a11y/nciddsPage.spec.ts
index 38c793b619..175a39c7cd 100644
--- a/tests/cypress/cypress/integration/a11y/nciddsPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/nciddsPage.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("NCIDDS-AD Page 508 Compliance Test", () => {
   it("Check a11y on NCIDDSAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("NCIDDS-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ohdadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ohdadPage.spec.ts
index 3c63951791..60ab3987a4 100644
--- a/tests/cypress/cypress/integration/a11y/ohdadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ohdadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("OHD-AD Page 508 Compliance Test", () => {
   it("Check a11y on OHDAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("OHD-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/oudadPage.spec.ts b/tests/cypress/cypress/integration/a11y/oudadPage.spec.ts
index 983c95b877..00fe5c8dc8 100644
--- a/tests/cypress/cypress/integration/a11y/oudadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/oudadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("OUD-AD Page 508 Compliance Test", () => {
   it("Check a11y on OUDAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("OUD-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/pc01adPage.spec.ts b/tests/cypress/cypress/integration/a11y/pc01adPage.spec.ts
index 4abf3a666b..a66df16a71 100644
--- a/tests/cypress/cypress/integration/a11y/pc01adPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/pc01adPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PC01-AD Page 508 Compliance Test", () => {
   it("Check a11y on PC01AD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PC01-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/pcradPage.spec.ts b/tests/cypress/cypress/integration/a11y/pcradPage.spec.ts
index 95926ec476..61dd7bdfd5 100644
--- a/tests/cypress/cypress/integration/a11y/pcradPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/pcradPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PCR-AD Page 508 Compliance Test", () => {
   it("Check a11y on PCRAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PCR-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ppcadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ppcadPage.spec.ts
index 5d455dc4fd..37a6e36baa 100644
--- a/tests/cypress/cypress/integration/a11y/ppcadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ppcadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PPC-AD Page 508 Compliance Test", () => {
   it("Check a11y on PPCAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PPC-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/pqi01adPage.spec.ts b/tests/cypress/cypress/integration/a11y/pqi01adPage.spec.ts
index 56972d688d..0bc0fc9d29 100644
--- a/tests/cypress/cypress/integration/a11y/pqi01adPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/pqi01adPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PQI01-AD Page 508 Compliance Test", () => {
   it("Check a11y on PQI01AD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI01-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/pqi05adPage.spec.ts b/tests/cypress/cypress/integration/a11y/pqi05adPage.spec.ts
index 440057117c..7bc388e54e 100644
--- a/tests/cypress/cypress/integration/a11y/pqi05adPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/pqi05adPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PQI05-AD Page 508 Compliance Test", () => {
   it("Check a11y on PQI05AD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI05-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/pqi08adPage.spec.ts b/tests/cypress/cypress/integration/a11y/pqi08adPage.spec.ts
index 06ccce4d17..e9ed6ce3d8 100644
--- a/tests/cypress/cypress/integration/a11y/pqi08adPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/pqi08adPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PQI08-AD Page 508 Compliance Test", () => {
   it("Check a11y on PQI08AD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI08-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/pqi15adPage.spec.ts b/tests/cypress/cypress/integration/a11y/pqi15adPage.spec.ts
index 464f242e75..593bf3ac97 100644
--- a/tests/cypress/cypress/integration/a11y/pqi15adPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/pqi15adPage.spec.ts
@@ -1,6 +1,7 @@
 describe("PQI15-AD Page 508 Compliance Test", () => {
   it("Check a11y on PQI15AD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI15-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ssaadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ssaadPage.spec.ts
index fbd732c1af..a6ea1cacd6 100644
--- a/tests/cypress/cypress/integration/a11y/ssaadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ssaadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("SAA-AD Page 508 Compliance Test", () => {
   it("Check a11y on SAAAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("SAA-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/a11y/ssdadPage.spec.ts b/tests/cypress/cypress/integration/a11y/ssdadPage.spec.ts
index 98d2e11f77..6175a672e5 100644
--- a/tests/cypress/cypress/integration/a11y/ssdadPage.spec.ts
+++ b/tests/cypress/cypress/integration/a11y/ssdadPage.spec.ts
@@ -1,6 +1,7 @@
 describe("SSD-AD Page 508 Compliance Test", () => {
   it("Check a11y on SSDAD Page", () => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("SSD-AD");
     cy.checkA11yOfPage();
diff --git a/tests/cypress/cypress/integration/features/NDR_validation_updates.spec.ts b/tests/cypress/cypress/integration/features/NDR_validation_updates.spec.ts
index 47fa4802de..f669ffb32f 100644
--- a/tests/cypress/cypress/integration/features/NDR_validation_updates.spec.ts
+++ b/tests/cypress/cypress/integration/features/NDR_validation_updates.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 16341 NDR set validation updates for all measures ", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
   });
 
   it("Click on NO for the first question then click on validate and complete button for CCP-AD", () => {
diff --git a/tests/cypress/cypress/integration/features/PRINT.spec.ts b/tests/cypress/cypress/integration/features/PRINT.spec.ts
index bbfd44e55a..bc7755d17d 100644
--- a/tests/cypress/cypress/integration/features/PRINT.spec.ts
+++ b/tests/cypress/cypress/integration/features/PRINT.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: AMR-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("AMR-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/add_validation_to_rate_when_user_selects_multiple_Data_Sources.spec.ts b/tests/cypress/cypress/integration/features/add_validation_to_rate_when_user_selects_multiple_Data_Sources.spec.ts
index 2985bbcb6c..3fd10180e9 100644
--- a/tests/cypress/cypress/integration/features/add_validation_to_rate_when_user_selects_multiple_Data_Sources.spec.ts
+++ b/tests/cypress/cypress/integration/features/add_validation_to_rate_when_user_selects_multiple_Data_Sources.spec.ts
@@ -1,6 +1,7 @@
 describe("Add Validation to Rate when user selects multiple Data Sources.", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCP-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/adding_link_to_combined_rates_component.spec.ts b/tests/cypress/cypress/integration/features/adding_link_to_combined_rates_component.spec.ts
index 95a607f723..31b99501cb 100644
--- a/tests/cypress/cypress/integration/features/adding_link_to_combined_rates_component.spec.ts
+++ b/tests/cypress/cypress/integration/features/adding_link_to_combined_rates_component.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 16411 Restructuring Data Source Text boxes", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCP-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/combined_rates_validation_warnings.spec.ts b/tests/cypress/cypress/integration/features/combined_rates_validation_warnings.spec.ts
index 376c77576e..3eac27fdc0 100644
--- a/tests/cypress/cypress/integration/features/combined_rates_validation_warnings.spec.ts
+++ b/tests/cypress/cypress/integration/features/combined_rates_validation_warnings.spec.ts
@@ -1,6 +1,7 @@
 describe("Combined rates validation testing", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("OUD-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/copy_coreset_and_measures_for_new_year.spec.ts b/tests/cypress/cypress/integration/features/copy_coreset_and_measures_for_new_year.spec.ts
index d914a5795b..1e18a1d40d 100644
--- a/tests/cypress/cypress/integration/features/copy_coreset_and_measures_for_new_year.spec.ts
+++ b/tests/cypress/cypress/integration/features/copy_coreset_and_measures_for_new_year.spec.ts
@@ -1,6 +1,7 @@
 describe("Coresets and measures should reflect the chosen year", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
   });
 
   it("displays the correct information based on 2021", () => {
diff --git a/tests/cypress/cypress/integration/features/data_source_rate_to_auto_calculate_in_OPM.spec.ts b/tests/cypress/cypress/integration/features/data_source_rate_to_auto_calculate_in_OPM.spec.ts
index 9120f29b4d..6c507b9bf0 100644
--- a/tests/cypress/cypress/integration/features/data_source_rate_to_auto_calculate_in_OPM.spec.ts
+++ b/tests/cypress/cypress/integration/features/data_source_rate_to_auto_calculate_in_OPM.spec.ts
@@ -1,6 +1,7 @@
 describe("Data source/ Rate to auto calculate in OPM", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUA-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/date_range_adjustment.spec.ts b/tests/cypress/cypress/integration/features/date_range_adjustment.spec.ts
index 85280a6bbf..8f48f1c5a4 100644
--- a/tests/cypress/cypress/integration/features/date_range_adjustment.spec.ts
+++ b/tests/cypress/cypress/integration/features/date_range_adjustment.spec.ts
@@ -1,6 +1,7 @@
 describe("Date Range Adjustment for Start/End date", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCP-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/export_all_measures.spec.ts b/tests/cypress/cypress/integration/features/export_all_measures.spec.ts
index 187251b60e..026a489392 100644
--- a/tests/cypress/cypress/integration/features/export_all_measures.spec.ts
+++ b/tests/cypress/cypress/integration/features/export_all_measures.spec.ts
@@ -3,6 +3,7 @@ import { measureAbbrList2021 } from "../../../support/commands/commands";
 describe.skip("Export All Measures", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.window().then((win) => {
       cy.stub(win, "open").callsFake((url) => {
         win.location.href = url;
diff --git a/tests/cypress/cypress/integration/features/kebab_menu_measures.spec.ts b/tests/cypress/cypress/integration/features/kebab_menu_measures.spec.ts
index 5a87faa5b8..f4605d771b 100644
--- a/tests/cypress/cypress/integration/features/kebab_menu_measures.spec.ts
+++ b/tests/cypress/cypress/integration/features/kebab_menu_measures.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("Measure kebab menus", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
   });
 
   it('displays "View" option', () => {
diff --git a/tests/cypress/cypress/integration/features/measure_validation_error_creation_updates.spec.ts b/tests/cypress/cypress/integration/features/measure_validation_error_creation_updates.spec.ts
index 69758b80bc..263033ea2b 100644
--- a/tests/cypress/cypress/integration/features/measure_validation_error_creation_updates.spec.ts
+++ b/tests/cypress/cypress/integration/features/measure_validation_error_creation_updates.spec.ts
@@ -1,6 +1,7 @@
 describe("Confirm Validate Measure Errors", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CHL-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/measurement_spec_def_of_pop_validation_text_changes.spec.ts b/tests/cypress/cypress/integration/features/measurement_spec_def_of_pop_validation_text_changes.spec.ts
index c2822eb564..6dae08c1f0 100644
--- a/tests/cypress/cypress/integration/features/measurement_spec_def_of_pop_validation_text_changes.spec.ts
+++ b/tests/cypress/cypress/integration/features/measurement_spec_def_of_pop_validation_text_changes.spec.ts
@@ -1,6 +1,7 @@
 describe("Measurement Specification/Definition of Population/Validation text changes (#85, #87, #93)", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
   });
 
diff --git a/tests/cypress/cypress/integration/features/partially_completed_validation.spec.ts b/tests/cypress/cypress/integration/features/partially_completed_validation.spec.ts
index 0fab377003..0feb2d121f 100644
--- a/tests/cypress/cypress/integration/features/partially_completed_validation.spec.ts
+++ b/tests/cypress/cypress/integration/features/partially_completed_validation.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("OY2 16341 NDR set validation updates for all measures ", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
   });
 
   it("should throw validation error for partially completed ndr sets - just qualifiers", () => {
diff --git a/tests/cypress/cypress/integration/features/reporting_in_FY21_tag_for_alt_data_sources.spec.ts b/tests/cypress/cypress/integration/features/reporting_in_FY21_tag_for_alt_data_sources.spec.ts
index 10f20a402e..6f6cce0460 100644
--- a/tests/cypress/cypress/integration/features/reporting_in_FY21_tag_for_alt_data_sources.spec.ts
+++ b/tests/cypress/cypress/integration/features/reporting_in_FY21_tag_for_alt_data_sources.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 15211 Reporting in FY22 Tag for Alt Data Sources", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
   });
 
   it("N/A And Completed Statuses", () => {
diff --git a/tests/cypress/cypress/integration/features/restructuring_data_source_text_boxes.spec.ts b/tests/cypress/cypress/integration/features/restructuring_data_source_text_boxes.spec.ts
index 6dbf63cc2c..4cfce8e479 100644
--- a/tests/cypress/cypress/integration/features/restructuring_data_source_text_boxes.spec.ts
+++ b/tests/cypress/cypress/integration/features/restructuring_data_source_text_boxes.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 16411 Restructuring Data Source Text boxes", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCP-AD");
   });
diff --git a/tests/cypress/cypress/integration/features/state_specific_measures.spec.ts b/tests/cypress/cypress/integration/features/state_specific_measures.spec.ts
index 7af1ce56e2..e5724518c9 100644
--- a/tests/cypress/cypress/integration/features/state_specific_measures.spec.ts
+++ b/tests/cypress/cypress/integration/features/state_specific_measures.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("Add state specific measure testing", () => {
   before(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.get('[data-cy="add-hhbutton"]').click(); // clicking on adding child core set measures
     cy.get('[data-cy="HealthHomeCoreSet-SPA"]').select(1); // select first available SPA
     cy.get('[data-cy="Create"]').click(); //clicking create
diff --git a/tests/cypress/cypress/integration/features/submit_coreset.spec.ts b/tests/cypress/cypress/integration/features/submit_coreset.spec.ts
index a235eafb46..2c4478f46f 100644
--- a/tests/cypress/cypress/integration/features/submit_coreset.spec.ts
+++ b/tests/cypress/cypress/integration/features/submit_coreset.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("Submit Core Set button", () => {
   beforeEach(() => {
     cy.login("stateuser4");
+    cy.selectYear("2021");
     cy.get('[data-cy="adult-kebab-menu"]').click();
     cy.get('[data-cy="Reset All Measures"]').first().click();
     cy.wait(1000);
diff --git a/tests/cypress/cypress/integration/features/update_user_auth_handling_in_ui.spec.ts b/tests/cypress/cypress/integration/features/update_user_auth_handling_in_ui.spec.ts
index 9caeeb8e90..03106a409a 100644
--- a/tests/cypress/cypress/integration/features/update_user_auth_handling_in_ui.spec.ts
+++ b/tests/cypress/cypress/integration/features/update_user_auth_handling_in_ui.spec.ts
@@ -5,6 +5,7 @@ describe("Confirm Admin View", () => {
     cy.xpath("//input[@name='password']").type(Cypress.env("TEST_PASSWORD_1"));
     cy.get('[data-cy="login-with-cognito-button"]').click();
     cy.get('[data-cy="Go To State Home"]').click();
+    cy.selectYear("2021");
     cy.get('[data-cy="ACS"]').click();
     cy.get('[data-cy="HPC-AD"]').click();
     cy.get('[data-cy="Save"]').should("be.disabled");
diff --git a/tests/cypress/cypress/integration/features/user_must_select_a_data_source_selection_validation.spec.ts b/tests/cypress/cypress/integration/features/user_must_select_a_data_source_selection_validation.spec.ts
index bc133ab31c..1b1d26e781 100644
--- a/tests/cypress/cypress/integration/features/user_must_select_a_data_source_selection_validation.spec.ts
+++ b/tests/cypress/cypress/integration/features/user_must_select_a_data_source_selection_validation.spec.ts
@@ -1,6 +1,7 @@
 describe("User must select a data source selection validation", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
   });
   it("verify error message when no data entered and click on validate button", () => {
     cy.get('[data-cy="ACS"]').click();
diff --git a/tests/cypress/cypress/integration/init/create_delete_child.spec.ts b/tests/cypress/cypress/integration/init/create_delete_child.spec.ts
index afc254950e..b35a90238f 100644
--- a/tests/cypress/cypress/integration/init/create_delete_child.spec.ts
+++ b/tests/cypress/cypress/integration/init/create_delete_child.spec.ts
@@ -1,6 +1,7 @@
 describe("Child Core Sets Should be able to be deleted and created", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
   });
 
   it("Creates separate child core-set", () => {
diff --git a/tests/cypress/cypress/integration/init/create_delete_healthhome.spec.ts b/tests/cypress/cypress/integration/init/create_delete_healthhome.spec.ts
index 6ba4a020b2..b563670a8b 100644
--- a/tests/cypress/cypress/integration/init/create_delete_healthhome.spec.ts
+++ b/tests/cypress/cypress/integration/init/create_delete_healthhome.spec.ts
@@ -1,6 +1,7 @@
 describe("Health Home Sets Should be able to be deleted and created", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.wait(2000);
   });
 
diff --git a/tests/cypress/cypress/integration/measures/adult/AMMAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/AMMAD.spec.ts
index 365f5ca5f3..113fa436dd 100644
--- a/tests/cypress/cypress/integration/measures/adult/AMMAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/AMMAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: AMM-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("AMM-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/AMRAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/AMRAD.spec.ts
index de45bffd19..e873670fd0 100644
--- a/tests/cypress/cypress/integration/measures/adult/AMRAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/AMRAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: AMR-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("AMR-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/BCSAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/BCSAD.spec.ts
index 483ecf1ab0..f189992362 100644
--- a/tests/cypress/cypress/integration/measures/adult/BCSAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/BCSAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: BCS-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("BCS-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/CBPAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/CBPAD.spec.ts
index 4ebf3b6656..2159f105c8 100644
--- a/tests/cypress/cypress/integration/measures/adult/CBPAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/CBPAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure 34: CBP-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CBP-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/CCPAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/CCPAD.spec.ts
index 630a66157b..4f3690cef7 100644
--- a/tests/cypress/cypress/integration/measures/adult/CCPAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/CCPAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: CCP-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCP-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/CCSAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/CCSAD.spec.ts
index c03f9cabd2..37a328e7d5 100644
--- a/tests/cypress/cypress/integration/measures/adult/CCSAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/CCSAD.spec.ts
@@ -1,6 +1,7 @@
 describe("CCS-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCS-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/CCWAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/CCWAD.spec.ts
index 95b61f6bc1..b6241b5833 100644
--- a/tests/cypress/cypress/integration/measures/adult/CCWAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/CCWAD.spec.ts
@@ -1,6 +1,7 @@
 describe("CCW-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CCW-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/CDFAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/CDFAD.spec.ts
index aa4a7f1bab..482c8ea689 100644
--- a/tests/cypress/cypress/integration/measures/adult/CDFAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/CDFAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: CDF-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CDF-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/CHLAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/CHLAD.spec.ts
index b6eb8e1a4f..470f61e01e 100644
--- a/tests/cypress/cypress/integration/measures/adult/CHLAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/CHLAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: CHL-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("CHL-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/COBAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/COBAD.spec.ts
index 40a9393a9a..549a948175 100644
--- a/tests/cypress/cypress/integration/measures/adult/COBAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/COBAD.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 9940 COB-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("COB-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/FUAAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/FUAAD.spec.ts
index e2aeea54a5..1ce7ec0cb4 100644
--- a/tests/cypress/cypress/integration/measures/adult/FUAAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/FUAAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: FUA-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUA-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/FUHAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/FUHAD.spec.ts
index 66eef1a7af..8b4f3ab0a1 100644
--- a/tests/cypress/cypress/integration/measures/adult/FUHAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/FUHAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure 10: FUH-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUH-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/FUMAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/FUMAD.spec.ts
index e1bdab87ce..86257cedf7 100644
--- a/tests/cypress/cypress/integration/measures/adult/FUMAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/FUMAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: FUM-AD", () => {
   before(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FUM-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/FVAAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/FVAAD.spec.ts
index c14c91d31c..9149134de5 100644
--- a/tests/cypress/cypress/integration/measures/adult/FVAAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/FVAAD.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 9898 FVA-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("FVA-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/HPCAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/HPCAD.spec.ts
index 182f1b4015..a0066863d6 100644
--- a/tests/cypress/cypress/integration/measures/adult/HPCAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/HPCAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: HPC-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HPC-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/HPCMIAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/HPCMIAD.spec.ts
index 459e9cb25c..2b2328db42 100644
--- a/tests/cypress/cypress/integration/measures/adult/HPCMIAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/HPCMIAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: HPCMI-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HPCMI-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/HVLAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/HVLAD.spec.ts
index 79004cd33c..ed798ffb6d 100644
--- a/tests/cypress/cypress/integration/measures/adult/HVLAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/HVLAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: HVL-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HVL-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/MSCAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/MSCAD.spec.ts
index 4070a2652b..87aa8a9f0b 100644
--- a/tests/cypress/cypress/integration/measures/adult/MSCAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/MSCAD.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 8977 Measure 15 MSC-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("MSC-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/NCIDDSAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/NCIDDSAD.spec.ts
index 6c40bdeb00..d84a813ced 100644
--- a/tests/cypress/cypress/integration/measures/adult/NCIDDSAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/NCIDDSAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: HPCMI-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("HPCMI-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/OHDAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/OHDAD.spec.ts
index 18c67545d6..19ee20df90 100644
--- a/tests/cypress/cypress/integration/measures/adult/OHDAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/OHDAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: OHD-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("OHD-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/OUDAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/OUDAD.spec.ts
index 01a5e7291c..ed2d1b0dcb 100644
--- a/tests/cypress/cypress/integration/measures/adult/OUDAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/OUDAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: OUD-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("OUD-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PC01AD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PC01AD.spec.ts
index 534fd672fc..2099c808e5 100644
--- a/tests/cypress/cypress/integration/measures/adult/PC01AD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PC01AD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PC01-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PC01-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PCRAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PCRAD.spec.ts
index 3ffedbb8b1..52a6de718d 100644
--- a/tests/cypress/cypress/integration/measures/adult/PCRAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PCRAD.spec.ts
@@ -1,6 +1,7 @@
 describe("PCR-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PCR-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PPCAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PPCAD.spec.ts
index edf22acf79..d9811a3556 100644
--- a/tests/cypress/cypress/integration/measures/adult/PPCAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PPCAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PPC-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PPC-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PQI01AD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PQI01AD.spec.ts
index 2be16bd3d0..0167b01d8b 100644
--- a/tests/cypress/cypress/integration/measures/adult/PQI01AD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PQI01AD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PQI01-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI01-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PQI05AD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PQI05AD.spec.ts
index 65c44ec293..ceef8ee71a 100644
--- a/tests/cypress/cypress/integration/measures/adult/PQI05AD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PQI05AD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PQI05-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI05-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PQI08AD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PQI08AD.spec.ts
index 01831ebd8b..46686dbc12 100644
--- a/tests/cypress/cypress/integration/measures/adult/PQI08AD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PQI08AD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PQI08-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI08-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/PQI15AD.spec.ts b/tests/cypress/cypress/integration/measures/adult/PQI15AD.spec.ts
index 1970fe5005..77bffa3ea0 100644
--- a/tests/cypress/cypress/integration/measures/adult/PQI15AD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/PQI15AD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PQI15-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("PQI15-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/QUALIFIERS_adult.spec.ts b/tests/cypress/cypress/integration/measures/adult/QUALIFIERS_adult.spec.ts
index 72123d9c60..930230e65f 100644
--- a/tests/cypress/cypress/integration/measures/adult/QUALIFIERS_adult.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/QUALIFIERS_adult.spec.ts
@@ -1,6 +1,7 @@
 describe("AdultMeasure Qualifiers", () => {
   beforeEach(() => {
     cy.login("stateuser2");
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
   });
 
diff --git a/tests/cypress/cypress/integration/measures/adult/SAAAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/SAAAD.spec.ts
index bb07e3fbdb..9612f21a4b 100644
--- a/tests/cypress/cypress/integration/measures/adult/SAAAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/SAAAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: SAA-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("SAA-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/adult/SSDAD.spec.ts b/tests/cypress/cypress/integration/measures/adult/SSDAD.spec.ts
index 8ff17186f3..dfafab53b4 100644
--- a/tests/cypress/cypress/integration/measures/adult/SSDAD.spec.ts
+++ b/tests/cypress/cypress/integration/measures/adult/SSDAD.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: SSD-AD", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToAdultMeasures();
     cy.goToMeasure("SSD-AD");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/ADDCH.spec.ts b/tests/cypress/cypress/integration/measures/child/ADDCH.spec.ts
index b6a204cb2a..b5d28eea9f 100644
--- a/tests/cypress/cypress/integration/measures/child/ADDCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/ADDCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: oy2-9921 ADD-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("ADD-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/AMBCH.spec.ts b/tests/cypress/cypress/integration/measures/child/AMBCH.spec.ts
similarity index 99%
rename from tests/cypress/cypress/integration/measures/healthhome/AMBCH.spec.ts
rename to tests/cypress/cypress/integration/measures/child/AMBCH.spec.ts
index 928d58abef..15bf524c0e 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/AMBCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/AMBCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure 20: AMB-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("AMB-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/AMBHH.spec.ts b/tests/cypress/cypress/integration/measures/child/AMBHH.spec.ts
index cad4d618ae..cc687f4ab8 100644
--- a/tests/cypress/cypress/integration/measures/child/AMBHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/AMBHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure 19: AMB-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("AMB-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/AMRCH.spec.ts b/tests/cypress/cypress/integration/measures/child/AMRCH.spec.ts
index 7ab7d17719..350104e81d 100644
--- a/tests/cypress/cypress/integration/measures/child/AMRCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/AMRCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: AMR-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("AMR-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/APMCH.spec.ts b/tests/cypress/cypress/integration/measures/child/APMCH.spec.ts
index 76932f8164..59ab8f8475 100644
--- a/tests/cypress/cypress/integration/measures/child/APMCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/APMCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: APM-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("APM-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/APPCH.spec.ts b/tests/cypress/cypress/integration/measures/child/APPCH.spec.ts
index 0d23c6e56a..90abf2c5c0 100644
--- a/tests/cypress/cypress/integration/measures/child/APPCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/APPCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: APP-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("APP-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/AUDCH.spec.ts b/tests/cypress/cypress/integration/measures/child/AUDCH.spec.ts
index 961cde61f8..ad56697913 100644
--- a/tests/cypress/cypress/integration/measures/child/AUDCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/AUDCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: oy2_9922 AUD-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("AUD-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/CCPCH.spec.ts b/tests/cypress/cypress/integration/measures/child/CCPCH.spec.ts
index 37e3ad21f0..721cfee7ba 100644
--- a/tests/cypress/cypress/integration/measures/child/CCPCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/CCPCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure CCP-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CCP-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/CCWCH.spec.ts b/tests/cypress/cypress/integration/measures/child/CCWCH.spec.ts
index 12424722cf..98c9fdcb77 100644
--- a/tests/cypress/cypress/integration/measures/child/CCWCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/CCWCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: CCW-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CCW-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/CDFCH.spec.ts b/tests/cypress/cypress/integration/measures/child/CDFCH.spec.ts
index bdd92883a0..422200f5e1 100644
--- a/tests/cypress/cypress/integration/measures/child/CDFCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/CDFCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: oy2-8979 CDF-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CDF-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/CHLCH.spec.ts b/tests/cypress/cypress/integration/measures/child/CHLCH.spec.ts
index 802059bf62..64c7f47480 100644
--- a/tests/cypress/cypress/integration/measures/child/CHLCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/CHLCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: oy2-9923 CHL-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CHL-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/CISCH.spec.ts b/tests/cypress/cypress/integration/measures/child/CISCH.spec.ts
index 2b3ce26246..405e777259 100644
--- a/tests/cypress/cypress/integration/measures/child/CISCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/CISCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: CIS-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CIS-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/CPCCH.spec.ts b/tests/cypress/cypress/integration/measures/child/CPCCH.spec.ts
index be3eca30b1..42d99e5dcc 100644
--- a/tests/cypress/cypress/integration/measures/child/CPCCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/CPCCH.spec.ts
@@ -1,6 +1,7 @@
 describe("OY2 9963 CPC CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("CPC-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/DEVCH.spec.ts b/tests/cypress/cypress/integration/measures/child/DEVCH.spec.ts
index 892e019cf6..6dcbe1b304 100644
--- a/tests/cypress/cypress/integration/measures/child/DEVCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/DEVCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: DEV-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("DEV-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/FUHCH.spec.ts b/tests/cypress/cypress/integration/measures/child/FUHCH.spec.ts
index d524cf6256..e7c554688f 100644
--- a/tests/cypress/cypress/integration/measures/child/FUHCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/FUHCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: FUH-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("FUH-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/IMACH.spec.ts b/tests/cypress/cypress/integration/measures/child/IMACH.spec.ts
index 128b2961ff..7f1c1a4752 100644
--- a/tests/cypress/cypress/integration/measures/child/IMACH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/IMACH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: IMA-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("IMA-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/PPCCH.spec.ts b/tests/cypress/cypress/integration/measures/child/PPCCH.spec.ts
index fe31711dae..54bddeedab 100644
--- a/tests/cypress/cypress/integration/measures/child/PPCCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/PPCCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PPC-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("PPC-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/QUALIFIERS_child.spec.ts b/tests/cypress/cypress/integration/measures/child/QUALIFIERS_child.spec.ts
index 21cdd4ed8c..ddeae9f87a 100644
--- a/tests/cypress/cypress/integration/measures/child/QUALIFIERS_child.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/QUALIFIERS_child.spec.ts
@@ -1,6 +1,7 @@
 describe("Child Measure Qualifier: CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
   });
 
   it("Child Core Set Measures: Combined", () => {
diff --git a/tests/cypress/cypress/integration/measures/child/SFMCH.spec.ts b/tests/cypress/cypress/integration/measures/child/SFMCH.spec.ts
index fc32cd61d6..4354cce5f0 100644
--- a/tests/cypress/cypress/integration/measures/child/SFMCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/SFMCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: oy2-9936 SFM-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("SFM-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/W30CH.spec.ts b/tests/cypress/cypress/integration/measures/child/W30CH.spec.ts
index c840d09b4d..633b6e19f1 100644
--- a/tests/cypress/cypress/integration/measures/child/W30CH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/W30CH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure 45: W30-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("W30-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/WCCCH.spec.ts b/tests/cypress/cypress/integration/measures/child/WCCCH.spec.ts
index b43a950088..c0f0cdf2e4 100644
--- a/tests/cypress/cypress/integration/measures/child/WCCCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/WCCCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: WCC-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("WCC-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/child/WCVCH.spec.ts b/tests/cypress/cypress/integration/measures/child/WCVCH.spec.ts
index 8ed21bbb47..61937f5af5 100644
--- a/tests/cypress/cypress/integration/measures/child/WCVCH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/child/WCVCH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: oy2-9916 WCV-CH", () => {
   beforeEach(() => {
     cy.login();
+    cy.selectYear("2021");
     cy.goToChildCoreSetMeasures();
     cy.goToMeasure("WCV-CH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/AIFHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/AIFHH.spec.ts
index 064b53249a..878d03feb7 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/AIFHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/AIFHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: AIF-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("AIF-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/CBPHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/CBPHH.spec.ts
index 5eb3844af3..9ab178f0ec 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/CBPHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/CBPHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: CBP-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("CBP-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/CDFHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/CDFHH.spec.ts
index 782d6fdc71..4da9255c53 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/CDFHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/CDFHH.spec.ts
@@ -3,6 +3,7 @@ import { should } from "chai";
 describe("Measure: CDF-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("CDF-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/FUAHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/FUAHH.spec.ts
index 8501faa510..5a5c7b5d63 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/FUAHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/FUAHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: FUA-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("FUA-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/FUHHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/FUHHH.spec.ts
index 3f797c9941..79f01d0519 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/FUHHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/FUHHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: FUH-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("FUH-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/IETHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/IETHH.spec.ts
index 6644527f66..6290740d9b 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/IETHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/IETHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: IET-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("IET-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/IUHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/IUHH.spec.ts
index 4bb51b3932..a034c65db6 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/IUHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/IUHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: IU-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("IU-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/OUDHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/OUDHH.spec.ts
index da2cfb92a3..1460eee18f 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/OUDHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/OUDHH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: OUD-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("OUD-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/PCRHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/PCRHH.spec.ts
index 269dc7e35d..e554a32e90 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/PCRHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/PCRHH.spec.ts
@@ -1,6 +1,7 @@
 describe("PCR-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("PCR-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/PQI92HH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/PQI92HH.spec.ts
index 810b133a5e..166587c294 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/PQI92HH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/PQI92HH.spec.ts
@@ -1,6 +1,7 @@
 describe("Measure: PQI92-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.goToMeasure("PQI92-HH");
   });
diff --git a/tests/cypress/cypress/integration/measures/healthhome/QUALIFIERS_healthhome.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/QUALIFIERS_healthhome.spec.ts
index 43cbc492f7..40852c4cfc 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/QUALIFIERS_healthhome.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/QUALIFIERS_healthhome.spec.ts
@@ -1,6 +1,7 @@
 describe("Health Home Measure Qualifier: HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
   });
 
   it("Health Home Core Set Measures", () => {
diff --git a/tests/cypress/cypress/integration/measures/healthhome/SSHH.spec.ts b/tests/cypress/cypress/integration/measures/healthhome/SSHH.spec.ts
index 321e91305e..c91cb014ea 100644
--- a/tests/cypress/cypress/integration/measures/healthhome/SSHH.spec.ts
+++ b/tests/cypress/cypress/integration/measures/healthhome/SSHH.spec.ts
@@ -1,6 +1,7 @@
 describe.skip("Measure: SS-HH", () => {
   beforeEach(() => {
     cy.loginHealthHome();
+    cy.selectYear("2021");
     cy.goToHealthHomeSetMeasures();
     cy.addStateSpecificMeasure();
   });