Small fix to reset the buttons (flag/agree/disagree); Incorporated waitAndClick into automated tests