Remove TODOs, already implemented in CatalogBundleResourceTest