Merge #10555: [tests] various improvements to zmq_test.py