Restore ClientTest to working state

Accidentally modified class while merging.