added test for token and feature
Merge branch 'master' of https://github.com/pasmod/etm