diff --git a/containers/ecr-viewer/e2e/ecrLibrary.spec.ts b/containers/ecr-viewer/e2e/ecrLibrary.spec.ts
index 4c226abb5..706dd7d22 100644
--- a/containers/ecr-viewer/e2e/ecrLibrary.spec.ts
+++ b/containers/ecr-viewer/e2e/ecrLibrary.spec.ts
@@ -11,7 +11,7 @@ test("eCR search filters results", async ({ page }) => {
   await page.goto("http://localhost:3000/ecr-viewer");
   await page.getByTestId("textInput").click();
   await page.getByTestId("textInput").fill("test");
-  await page.getByTestId("button").click();
+  await page.getByTestId("form").getByTestId("button").click();
   await expect(
     page.getByRole("cell", { name: "Adam Test DOB: 01/01/" }).first(),
   ).toBeVisible();
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts b/containers/ecr-viewer/e2e/ecrViewer.spec.ts
index 79fe08469..73fa20a46 100644
--- a/containers/ecr-viewer/e2e/ecrViewer.spec.ts
+++ b/containers/ecr-viewer/e2e/ecrViewer.spec.ts
@@ -12,15 +12,9 @@ test("eCR Viewer matches snapshot fully expanded", async ({ page }) => {
   await page.goto(
     "http://localhost:3000/ecr-viewer/view-data?id=1.2.840.114350.1.13.297.3.7.8.688883.573942",
   );
-  await page.getByTestId("accordionButton_Giardiasis-(disorder)").click();
-  await page
-    .getByTestId("accordionButton_Cryptosporidiosis-(disorder)")
-    .click();
-  await page
-    .getByTestId(
-      "accordionButton_Infection-caused-by-Entamoeba-histolytica-(disorder)",
-    )
-    .click();
+  await page.getByTestId("accordionButton_Giardiasis").click();
+  await page.getByTestId("accordionButton_Cryptosporidiosis").click();
+  await page.getByTestId("accordionButton_Amebiasis").click();
   await page.getByRole("button", { name: "Expand all labs" }).click();
   await expect(page).toHaveScreenshot({ fullPage: true });
 });
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-chromium-darwin.png b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-chromium-darwin.png
index d893fca84..87ed3e63f 100644
Binary files a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-chromium-darwin.png and b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-chromium-darwin.png differ
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-firefox-darwin.png b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-firefox-darwin.png
index 687229000..108e90d17 100644
Binary files a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-firefox-darwin.png and b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-firefox-darwin.png differ
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-webkit-darwin.png b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-webkit-darwin.png
index 45dacfad9..e637e5ffd 100644
Binary files a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-webkit-darwin.png and b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-1-webkit-darwin.png differ
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-chromium-darwin.png b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-chromium-darwin.png
index e7e1192cd..96e69766c 100644
Binary files a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-chromium-darwin.png and b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-chromium-darwin.png differ
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-firefox-darwin.png b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-firefox-darwin.png
index e292d63c7..27282c063 100644
Binary files a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-firefox-darwin.png and b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-firefox-darwin.png differ
diff --git a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-webkit-darwin.png b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-webkit-darwin.png
index 4b9ad120d..f4ab61de1 100644
Binary files a/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-webkit-darwin.png and b/containers/ecr-viewer/e2e/ecrViewer.spec.ts-snapshots/eCR-Viewer-matches-snapshot-fully-expanded-1-webkit-darwin.png differ