Tweaked eventemitter code- now all new tests pass