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