Add unit tests for direct construction of Catalog