Refactored specs with FactoryGirl