Tidied up tests