Refactored mock calls