Update Message class
Add tests for Message class