Updates to ClientTest.