Added some more grammar tests