Test fixes for recent language module changes