Refactor tests to use FactoryGirl