tidied up some tests