Finished tests for EventEmitter + added some bug fixes