Added event class, updated tests