revert changes to classify a keyword as an identifier if the last token is keyword
clean up tests