TestClient is now a bit more properly implemented