modified tests and added event emitter reference