Fix failing integration tests