Grammar 4.0 + more grammar tests