Rewinding tokens in case it is re-used.
Using battery of test tokens.
Fixing formatting issues and refactored for saner formatting handling.