Revert "Revert "Revert "message test"""

This reverts commit dbe0131ded9424c2132cb6b3c06d2d36facb4d96.