test client: bug fixes