Moving 1 call to fake service client