Fix some tests for Message module

Kinda ugly, but they work