added events, formatted testing template to accept them