Fixing broken integration tests