update Gemfile, improve test
reset usefull_scopes
fix tests