Extract classes out of adapters
Update Gemfile
Fix a random spec failure