refactored tests to use FactoryGirl