Service catalog tests

PR in progress.