test client tweaks