-- Made EventManager unit tests pass