Minor tweaks: working on testing services in catalogs