added GrammarTest
fixed ParserTest