Fix up the test suite