Small refactor of ZMQ Transport and added unit tests and integration test