Add questions and tests