Modified test client.