ENG-7200 Fix TestCatalogDiffs tests