Add factory_girl
Add comments