add more test data
builder of tokens as a stand alone module
Merge branch 'token_build'