Added new form with Repeat Event, fixed test