Merge pull request #1239 from ral-facilities/fix-flaky-test #4479

Job	Run time
End-to-End (with mock data) Tests	7m 12s
Lint & Unit Tests	8m 20s
End-to-End (with api) Tests	7m 57s
Bundle Analysis	1m 1s
Docker	1m 27s
	25m 57s

Provide feedback