A bit more work on the test suite