grammar: cleanup expr and fix between suffix expression
grammar: add tests for like operator and between