Merge "Add TetheredClient tests"