updated tests with FactoryGirl