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

Yes, it seems safer to only have it on test responses.