Refactor make query helper methods not assert calls but rather just stub them