Tidied up the tests a bit