Merge "Fix TetheredClient and TetheredClientTest"