Fix broken tests due to HttpClient changes.