Removed result id concept
Restructured supplement notes
Added Questionnaire tests