Refactoring how the HttpClient fakes are used to be easier to follow