Update event class.
Add event test.
Update event handler/queue.