Fix failing tests.