Use newer requests-mock syntax

You can specify mocks in requests-mock using the method name as the
function rather than having to repeat strings throughout code. This
makes it less likely you'll make a simple mistake and looks cleaner.

Change-Id: I4929f256d1bbffae909ebb4c08e994c16a4164b5
Merge "Use newer requests-mock syntax"