Update TestHttpClient for changes in interface