Added extends and variable grammars/tests