Further update to current FactoryGirl methods