update grammar and test