Pop test http client back where it belongs