Updates that fix tests
Update for latest master of jruby-parser