fix some factory_girl issues