TODO- amend tests to include more questions by non-user