Add check to run tests
Fix typo
Change ordering of questions
Questions/Confirmation clean-up