Fixed Tests and EntityGrammarBatchCompiler