test client and server improvements