fixing integration tests
Gemfile diffs merged