Tidied up some of the tests