Fix integration tests after refactoring.