Simplify Gemfile
Deprecate old style tests