clean up test_client a little