rm: test messages
Merge: master