TestingHttpClient improvements