Refactoring of FactoryGirl factories and tests