Update tests branch to match tweak on upstream/groovy-devel.