Fixed some issues with last changes

- extended test cases
- upgraded to use latest CZMQ master