Added tests for token-based comparation expressions