Fix bugs with helpers blocking requests

RFC @burden — These fixes should unblock you from being able to make requests.
Stub the query instead of the helper method, forces more of our code to be touched by the specs.