Finished all options for the catalog service with unit tests.