US632 - Remove old QuestionGroup data when a different scenario path is taken
US632 - Fix broken tests