Grammar 3.0 + grammar tests