Expand test suite, fix issues
Work on tokens, expand test suite