Close #54 #55

Refactor mock call