Add test messages
fix github 'vi' error to merge staging branch'