Actually fix the test suite this time...