finishes unit testing on tokens, fixes #12