fix mocked call order
shortcut script for running integration tests
Revert "Change V1 query for fix to shaped query bug"

This reverts commit 2a6515c9a5973e30ad9d8c53f83d866abe2ee223.
Correctly run GrantTool for integration test
bump requirement for HttpClient with renamed static object
Fix test to coerce to list before compare