much tidying of the test suite