Some work on the test suite