add more tests for service
backfill catalog tests