Fix up the last of the test suite