Updated test client