Add test for type matching
Merge branch 'match_service_by_type_not_name'