Tidied up tests.