GROOVY-6189: tweak method selection to be more compatible and remove change to test