Merge "Add a tests for service clients"