@@ -1,10 +1,6 @@
 <!-- markdownlint-disable-file -->
 # TODO
 
-## E2E Files with Skipped Tests
-
-`FORCE_COLOR=1 CI=1 npx playwright test`
-
 ## Visual Regression Testing
 
 Playwright's Built-in Visual Testing
@@ -17,6 +13,44 @@ Pros: It's free, everything stays local (no third-party services needed), setup
 
 Cons: Browser rendering can be inconsistent across different operating systems and machines, leading to "flaky" tests or false positives. Managing baselines for multiple browsers and resolutions manually can also be challenging at scale.
 
+## E2E
+
+ 56 …omium] › test/e2e/specs/02-pages/contact.spec.ts:15:3 › Contact Page › @ready hero section displays (5.3s)
+
+ 70 …test/e2e/specs/02-pages/homepage.spec.ts:25:3 › Homepage › @ready featured services section renders (5.5s)
+
+ 85 …st/e2e/specs/02-pages/services.spec.ts:21:3 › Services List Page › @ready services section displays (5.3s)
+
+ 93 [chromium] › test/e2e/specs/02-pages/tags.spec.ts:15:3 › Tags Index Page › @ready tag list displays (6.0s)
+
+100 …nsent-checkbox.spec.ts:89:3 › Newsletter GDPR Consent › @ready privacy policy link opens in new tab (6.6s)
+
+117 …ubscription.spec.ts:28:3 › Newsletter Subscription Form › @ready form rejects invalid email format (373ms)
+
+134 …nts/breadcrumbs.spec.ts:22:3 › Breadcrumbs Component › @ready breadcrumbs display on service pages (305ms)
+
+156 …5:3 › Consent Preferences Component › @containers full stack consent submission hits backend mocks (30.0s)
+
+163 …2e/specs/04-components/footer.spec.ts:30:3 › Footer Component › @ready footer has copyright notice (421ms)
+
+172 …ponents/icon.spec.ts:38:3 › Icon Component › default variant renders every local icon exactly once (30.1s)
+
+204 …/navigation-mobile.spec.ts:232:3 › Mobile Navigation › @ready can navigate to page from mobile menu (6.0s)
+
+219 …ares.spec.ts:46:3 › Social Shares Component › renders social share component inside testing fixture (5.3s)
+
+257 …› Theme Picker Component › System Preferences › @ready respects prefers-color-scheme on first visit (1.2s)
+
+361 …ility/aria-screen-readers.spec.ts:232:3 › ARIA and Screen Readers › @ready page has exactly one h1 (16.7s
+
+397 …/12-performance/lighthouse.spec.ts:9:3 › Lighthouse Performance › run Lighthouse audit on homepage (14.5s)
+
+653 …ares.spec.ts:46:3 › Social Shares Component › renders social share component inside testing fixture (5.5s)
+
+663 …Nanostore Persistence Across Navigation › @ready theme preference persists across View Transitions (30.2s)
+
+795 …ility/aria-screen-readers.spec.ts:232:3 › ARIA and Screen Readers › @ready page has exactly one h1 (10.8s)
+
 ## Missing E2E Component Tests
 
 - BugReporter
 
@@ -72,18 +72,18 @@
     "@adobe/remark-gridtables": "^3.0.19",
     "@astrojs/check": "0.9.8",
     "@astrojs/db": "^0.20.1",
-    "@astrojs/mdx": "5.0.2",
-    "@astrojs/preact": "5.0.2",
-    "@astrojs/rss": "4.0.17",
-    "@astrojs/sitemap": "^3.7.1",
-    "@astrojs/vercel": "^10.0.2",
+    "@astrojs/mdx": "5.0.3",
+    "@astrojs/preact": "5.1.0",
+    "@astrojs/rss": "4.0.18",
+    "@astrojs/sitemap": "^3.7.2",
+    "@astrojs/vercel": "^10.0.3",
     "@axe-core/playwright": "^4.11.1",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
     "@eslint/js": "10.0.1",
     "@github/relative-time-element": "^5.0.0",
     "@glidejs/glide": "^3.7.1",
     "@googlemaps/extended-component-library": "^0.6.14",
-    "@happy-dom/global-registrator": "^20.8.8",
+    "@happy-dom/global-registrator": "^20.8.9",
     "@lighthousejs/types": "^0.0.3",
     "@nanostores/lit": "^0.2.3",
     "@nanostores/persistent": "^1.3.3",
@@ -129,14 +129,14 @@
     "@upstash/search": "^0.1.7",
     "@vercel/analytics": "^2.0.1",
     "@vite-pwa/astro": "^1.2.0",
-    "@vitest/coverage-v8": "^4.1.1",
+    "@vitest/coverage-v8": "^4.1.2",
     "@webcomponents/template-shadowroot": "^0.2.1",
     "alex": "^11.0.1",
-    "astro": "6.0.8",
+    "astro": "6.1.1",
     "astro-link-validator": "github:rodgtr1/astro-link-validator",
     "astro-og-canvas": "^0.10.1",
     "astro-vtbot": "^2.1.12",
-    "baseline-browser-mapping": "^2.10.10",
+    "baseline-browser-mapping": "^2.10.11",
     "canvas-confetti": "^1.9.4",
     "confusing-browser-globals": "1.0.11",
     "cross-env": "^10.1.0",
@@ -157,7 +157,7 @@
     "eslint-plugin-yml": "3.3.1",
     "focus-trap": "8.0.1",
     "gsap": "^3.14.2",
-    "happy-dom": "^20.8.8",
+    "happy-dom": "^20.8.9",
     "hast-util-heading-rank": "^3.0.0",
     "hast-util-is-element": "^3.0.0",
     "html-element-attributes": "^3.5.0",
@@ -236,7 +236,7 @@
     "uuid": "^13.0.0",
     "vercel": "^50.37.1",
     "vite": "^8.0.3",
-    "vitest": "4.1.1",
+    "vitest": "4.1.2",
     "vitest-axe": "0.1.0",
     "workbox-build": "7.4.0",
     "zod": "4.3.6"
 
@@ -4,13 +4,21 @@
  * They should always pass and run quickly.
  */
 import { BasePage, test, expect } from '@test/e2e/helpers'
+import { wait } from '@test/e2e/helpers/waitTimeouts'
+
+const matchesPathname = (pathname: string, expectedPath: string) => {
+  const normalizedPathname = pathname !== '/' ? pathname.replace(/\/$/, '') : pathname
+  const normalizedExpectedPath = expectedPath !== '/' ? expectedPath.replace(/\/$/, '') : expectedPath
+
+  return normalizedPathname === normalizedExpectedPath
+}
 
 test.describe('Critical Paths @smoke', () => {
   test('@ready all main navigation pages are accessible', async ({ page: playwrightPage }) => {
     const page = await BasePage.init(playwrightPage)
-    for (const { url: path, title } of page.navigationItems) {
+    for (const { url: path } of page.navigationItems) {
       await page.goto(path)
-      await page.expectTitle(title)
+      await page.waitForURL(url => matchesPathname(url.pathname, path), { timeout: wait.defaultWait })
       await page.expectHeading()
     }
   })
@@ -24,14 +32,19 @@ test.describe('Critical Paths @smoke', () => {
     const page = await BasePage.init(playwrightPage)
     for (const { url: path } of page.navigationItems) {
       await page.goto('/')
-      const navigationComplete = page.waitForPageLoad({ requireNext: true })
+      const navigationComplete = page.waitForPageLoad({ requireNext: true, timeout: wait.navigation })
+      const urlComplete = page.waitForURL(url => matchesPathname(url.pathname, path), {
+        timeout: wait.navigation,
+      })
+
       await page.navigateToPage(path)
-      await navigationComplete
+
+      await urlComplete
+      await navigationComplete.catch(() => undefined)
       await playwrightPage.waitForFunction(() => {
         return !document.documentElement.hasAttribute('data-astro-transition')
       })
-      // eslint-disable-next-line security/detect-non-literal-regexp
-      await page.expectUrl(new RegExp(path))
+      await page.expectHeading()
     }
   })
 
 
@@ -5,6 +5,18 @@
  */
 import { BasePage, test, expect, setupConsoleErrorChecker, logConsoleErrors } from '@test/e2e/helpers'
 
+const getFirstHref = async (page: BasePage, selector: string): Promise<string | null> => {
+  return await page.page.locator(selector).evaluateAll((elements) => {
+    const firstLink = elements[0]
+
+    if (!(firstLink instanceof HTMLAnchorElement)) {
+      return null
+    }
+
+    return firstLink.getAttribute('href')
+  })
+}
+
 test.describe('Dynamic Pages @smoke', () => {
   test('@ready article detail page loads', async ({ page: playwrightPage }) => {
     const page = await BasePage.init(playwrightPage)
@@ -17,7 +29,7 @@ test.describe('Dynamic Pages @smoke', () => {
     const firstArticleLink = page.locator('a[href*="/articles/"]').first()
     await expect(firstArticleLink).toBeVisible()
 
-    const articleUrl = await firstArticleLink.getAttribute('href')
+    const articleUrl = await getFirstHref(page, 'a[href*="/articles/"]')
     expect(articleUrl).toBeTruthy()
 
     // Navigate to the article
@@ -41,8 +53,7 @@ test.describe('Dynamic Pages @smoke', () => {
     await page.waitForNetworkIdleBestEffort()
 
     // Find first service link
-    const firstServiceLink = page.locator('a[href*="/services/"]').first()
-    const serviceUrl = await firstServiceLink.getAttribute('href')
+    const serviceUrl = await getFirstHref(page, 'a[href^="/services/"]:not([href="/services/"])')
 
     if (!serviceUrl) {
       test.skip()
@@ -70,8 +81,7 @@ test.describe('Dynamic Pages @smoke', () => {
     await page.waitForNetworkIdleBestEffort()
 
     // Find first case study link
-    const firstCaseStudyLink = page.locator('a[href*="/case-studies/"]').first()
-    const caseStudyUrl = await firstCaseStudyLink.getAttribute('href')
+    const caseStudyUrl = await getFirstHref(page, 'a[href*="/case-studies/"]')
 
     if (!caseStudyUrl) {
       test.skip()
@@ -145,8 +155,7 @@ test.describe('Dynamic Pages @smoke', () => {
     // NOTE: Avoid strict 'networkidle' gating on WebKit/mobile-safari (can hang on long-lived requests).
     await page.waitForNetworkIdleBestEffort()
 
-    const firstArticleLink = page.locator('a[href*="/articles/"]').first()
-    const articleUrl = await firstArticleLink.getAttribute('href')
+    const articleUrl = await getFirstHref(page, 'a[href*="/articles/"]')
 
     if (articleUrl) {
       resetChecker()
@@ -165,8 +174,7 @@ test.describe('Dynamic Pages @smoke', () => {
     // NOTE: Avoid strict 'networkidle' gating on WebKit/mobile-safari (can hang on long-lived requests).
     await page.waitForNetworkIdleBestEffort()
 
-    const firstServiceLink = page.locator('a[href*="/services/"]').first()
-    const serviceUrl = await firstServiceLink.getAttribute('href')
+    const serviceUrl = await getFirstHref(page, 'a[href^="/services/"]:not([href="/services/"])')
 
     if (serviceUrl) {
       resetChecker()
@@ -185,8 +193,7 @@ test.describe('Dynamic Pages @smoke', () => {
     // NOTE: Avoid strict 'networkidle' gating on WebKit/mobile-safari (can hang on long-lived requests).
     await page.waitForNetworkIdleBestEffort()
 
-    const firstCaseStudyLink = page.locator('a[href*="/case-studies/"]').first()
-    const caseStudyUrl = await firstCaseStudyLink.getAttribute('href')
+    const caseStudyUrl = await getFirstHref(page, 'a[href*="/case-studies/"]')
 
     if (caseStudyUrl) {
       resetChecker()
@@ -220,8 +227,7 @@ test.describe('Dynamic Pages @smoke', () => {
     // NOTE: Avoid strict 'networkidle' gating on WebKit/mobile-safari (can hang on long-lived requests).
     await page.waitForNetworkIdleBestEffort()
 
-    const firstArticleLink = page.locator('a[href*="/articles/"]').first()
-    const articleUrl = await firstArticleLink.getAttribute('href')
+    const articleUrl = await getFirstHref(page, 'a[href*="/articles/"]')
 
     if (!articleUrl) {
       test.skip()
 
@@ -197,7 +197,7 @@ describe('ARIA and Screen Readers', () => {
   /**
    * Axe checks that form inputs have labels
    */
-  test.only('@ready form inputs have labels', async ({ page: playwrightPage }) => {
+  test('@ready form inputs have labels', async ({ page: playwrightPage }) => {
     const page = await BasePage.init(playwrightPage)
     await runAcrossPages(page, 'check form input labels', async (url) => {
       await page.goto(url)
 
@@ -233,7 +233,7 @@ describe('WCAG Compliance', () => {
    * Axe does not check if prefers-reduced-motion is respected; this is considered
    * a complex, context-dependent check that requires manual inspection.
    */
-  test.only('@ready page is usable without motion', async ({ page: playwrightPage }) => {
+  test('@ready page is usable without motion', async ({ page: playwrightPage }) => {
     const page = await BasePage.init(playwrightPage)
     await runAcrossPages(page, 'check reduced motion usability', async (url) => {
       await page.page.emulateMedia({ reducedMotion: 'reduce' })