Add Event class & test