[PATCH 3/5] Automated tests for Catalogs and CatalogEntries.