Added event types (without tests yet)
Added tests for base class of events