Move the ServiceCatalog into the token resource.
Happy-path unit tests for token creation.