Ensure tests pass on raet and zmq
Merge pull request #14300 from pass-by-value/more_matcher_test_fixes

Ensure tests pass on raet and zmq