Added test for new message text
Include incorrect token string in error message

https://www.pivotaltracker.com/story/show/69910594

[Delivers #69910594]