Fix up the test suite after removing one test