Making client test work better