Fix some existing tests.