Add the check for token type and modify the test cases

Add the check for token type and modify the test cases #259