Tidied up my JUnit