Fix #22. Add new tests for token assesment. Throw new error when no tokens are discovered.

Address missed tokens and tokens with extra characters from Issue #22