Moved Events system to separate module
Added generic test