refactor tests
cleanup
IMP: token calculation