Refator as egg... follow tests