test cleanup
Merge branch 'zeromq-master' into happyhappy
test cleanup, part II