fixup test message object class - it should not be in restrack mechanism