More cypress fixes
General MR
Summary
Additional fixes from previously merged MR !288 (merged)
As there are certain pipelines still failing big-bang/bigbang!5424 (closed)
Relevant logs/screenshots
(Include any relevant logs/screenshots)
Linked Issue
Upgrade Notices
N/A
Edited by Brian Jackson