Implemented more catalog functionality and added unit tests for same.