Update the test cases according to the changes for Message.class.php