Updated TestClient. Final commit.