Code coverage for ApiService::makeCall(), also a bit of refactoring and a new mock file.