Refactored tests with FactoryGirl gem