tweaked test client