Merge "service: Add RegisterTestClient"