Added more of the catalogService options along with unit tests.