more work on the test suite