Add tests for all current message types
Fix incorrect message type