Modifying demo order and adding test command