refactored specs, added FactoryGirl, functionality remains the same