Got CatalogTest working