tidied up the tests