Fixed #16087 -- Added ResolverMatch instance to test client response

Yep, I think that's correct.