refactored with expects and factory_girl