Minor alterations to Message class delegation. Test class created.