Make fixtures 'future proof'
Merge branch 'develop' into feature/issue-32-additional-questions-bug-fix