Add test for type matching

Added a test for matching against the service catalog by type.

("type" is a go reserved keyword, hence the weird variable naming)