Test suite tidied up