change token class
add new test cases