Refactor func. tests RFC8040 service-path calls

No match.