Added some tests for Catalog