moved questionnaire canonical reference check, code cleanup, more tests

moved questionnaire canonical reference check, code cleanup, more tests #583