Fix broken test. (justinvdm)
Merge branch 'develop-frontend' into feature/issue-543-refactor-choice-state-choices-into-their-own-view