Modernize test infrastructure.
Add NonTerminal matcher for non-terminal rule encapsulation.