Added wait_on_self behavior, and also a zeromq listener/sender test
Move number of miliseconds to possibly wait up to 10