[Reviewer: Mike] Remove extra check for capabilities

Take out extra check for whether we have capabilities in retry_request (this is already done correctly in the individual query functions).

Updated UT so that it include a location query being reattempted more than once

Fixes #434