Fixes for tests#62

MJGaughran merged 13 commits into

mainDiamondLightSource/deploy-tools:mainfrom

fixes-for-testsDiamondLightSource/deploy-tools:fixes-for-testsCopy head branch name to clipboard