Fix unit tests since ordering questionnaire by ID #2413