Fixed tests, Gemfile cleaned up