refactor the lewa mock