finish fixing integration tests