Made tests more discovery-friendly
Added support of more recent PyZMQ