add test data
refactor TokenHandler
fixed bug
fixed wrong data
fixed wrong data again
fixed bugs