Added additional grammar tests