Fixed questionnaire test, refactored questionnaire views