tidied up some tests.