update test_client3, and fixes