Updated helpers and added xml suite file