Create new standard for naming factory files
Convert the rest of the specs to use FactoryGirl