Add Event and EventTest