partial tidy-up of test class (while waiting for tests to run :-)