Fixing HttpClient, and as a result fixing the HttpClient test, bringing coverage to 100%