chore: cswrr cleanup and e2e

[jukie]

What this PR does / why we need it:
Some cleanup after merging #7407

Which issue(s) this PR fixes:

Fixes #8575

Release Notes: No

[netlify]

✅ Deploy Preview for cerulean-figolla-1f9435 canceled.

Name	Link
🔨 Latest commit	e05809e
🔍 Latest deploy log	https://app.netlify.com/projects/cerulean-figolla-1f9435/deploys/69c420cd959fe10008c17d1c

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 74.32%. Comparing base (4aa6c37) to head (e05809e).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8582      +/-   ##
==========================================
- Coverage   74.33%   74.32%   -0.02%     
==========================================
  Files         243      243              
  Lines       38143    38143              
==========================================
- Hits        28354    28350       -4     
- Misses       7801     7805       +4     
  Partials     1988     1988              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[zirain]

looks like all e2e tests failed.

[jukie]

Yeah I thought metrics were the only issue, will fix