Start fixing integration tests