EventEmitter tests update