Similar to the client functions replace the requests mocking in
test_httpclient file with calls to requests-mock. This means we
test the actual data on the wire instead of the exact calls to
requests so they can change in future.
Change-Id: Id65374e14e3b18dfed46f0c78a95ff10502ce785