Improved EventManager unit test