Tweaking Event system, trying to add unit tests.