token unit test
Merge branch 'tokentest' into develop

* tokentest:
  token unit test