Add test for message footer
Update todo comment about annotations