added testcase for current grammar. fixed bug with tokens