tidied up some of the jUnit tests