Further work cleaning up the tests
Further work cleaning up the tests