Added more grammars and tests