Fix system test breakage due to merge conflicts

[rtuck99]

Fixes system tests which would have been fixed by #1686 except that a couple of changes got lost while resolving merge conflicts.

Link to dodal PR (if required): #N/A
(remember to update pyproject.toml with the dodal commit tag if you need it for tests to pass!)

Instructions to reviewer on how to test:

1. System tests pass
   https://gitlab.diamond.ac.uk/MX-GDA/hyperion-system-testing/-/pipelines/133573/test_report

Checks for reviewer

• Would the PR title make sense to a user on a set of release notes

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 93.01%. Comparing base (f3ddc4a) to head (c3e8979).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1751   +/-   ##
=======================================
  Coverage   93.01%   93.01%           
=======================================
  Files         164      164           
  Lines        8907     8907           
=======================================
  Hits         8285     8285           
  Misses        622      622           

Components	Coverage Δ
i24 SSX	77.15% <ø> (ø)
hyperion	98.73% <ø> (ø)
other	98.16% <ø> (ø)

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.