Add more tests for Message