Optimisations to docker test script