Make necessary changes re #8402

Unit test needs extending to test these changes.

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
Add unit test to test multiple workspace re #8402

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
Merge branch 'feature/8402_bank_to_workspace' into develop