Merge "Consolidate tests for getQueryInfo() and related methods."