cleaned up test client even more