better api for MockClient; tests