Update expected test outputs to match current Tool output

These changes update the expected output of unit tests to match the results produced by the Tool following antlr/antlr4#724 and antlr/antlr4#726.