Factory Girl : refactor done (patch 0.1.zoz)