added some tests for tokens, extended token-equal-p