Refactor questions
Test