Tidied up test class