Fix for ResourceCatalogTest failures