Make changes to EventEmitter Test