Extending Question & Test Learning Technology Specifications with Enhanced Questionnaire Models