Merge pull request #86 from justinsb/match_service_by_type_not_name

Add test for type matching