fixing specs and finished gemfile upgrades