Overall working on the message and adding tests for tokens.