Fix up the tests.