Tidied up the tests