Add further tests to verify client calls
Extract a service check function
Minor refactoring
Add convenience macro
Refactor for brevity