Merge "Add unit tests for services_client"