Ajay/Melanie | #0000 | Migration to aggregate test questionnaire usage
Ajay/Melanie | #2809 | Removed unused references