Changed fixtures to include Questionnaire year.