Properly fix issues from beamline tests

[DominicOram]

Following https://github.com/DiamondLightSource/mx-bluesky/issues/640 there are a number of issues that need to be fixed in main

Acceptance Criteria

• The testing ticket is gone through, if issues are easily fixed they are done so
• If they are not easily fixed new issues are made
• All issues found in testing are solved by one of the above

[DominicOram]

Many of the issues may be addressed in https://github.com/DiamondLightSource/mx-bluesky/pull/553