Work around change to EventEmitter.listeners
remove console.log's
fix streaming test idempotence