Fix and increase flexibility of language version override test (#3985)

Fix and increase flexibility of language version override test (#3985) #1979