Requires for test files fixed
Removed un-needed gems from gemfile
Gemfile cleanup
Re-ordered