Updated order of questions

Pivotal: 62450976

Changed the order of questions in the smart answers and updated the test accordingly