Tidied up use of junit