Move TestClient to make it available outside the lib