Another testclient improvement