tweaks to get tests running in latest 4.4 dev

Hi. just a few tweaks and it's happy with latest antlr master