Add Catalog class with some tests