ENG-7095: Fix broken TestCatalogUtil