Removed factory_girl references