Tidied up the tests.