Modified test code for message system