some cleanup for test client