Added tests for Catalog != expressions
Renamed Collection.catalog to Collection.index_and_catalog