Grammar 7.0 + grammar tests