Updated tests for Messages