Add factorygirl and cleanup gemfile