Updated grammar and test cases
Revert "Updated grammar and test cases"

This reverts commit 6fc27003e2aa8d1ed51f5e9d9e6abd566b535c2d.
Merge branch 'master' into Test