Add TCP to publisher and listener.
Make integration tests more robust