Fix failing integration tests.