updated tests for the new grammar