Tweak question order and update tests accordingly