added more token test cases
added more token test cases; updated token_string removal logic