Merge "Deduplicate client unit tests"