Use the same collection API (queryCatalog()) in tests that we use in production code