Fix up tests.