Added event emitter tests
Minor cleanups / fixes in EventEmitter