Fix language tests a bit (cherry picked from commit e92cac789fc84b116a03db04a5f7de8df48e34cd) Change-Id: I527e94c5af0921ff2559ce5a4ac7635be791c22e
I527e94c5af0921ff2559ce5a4ac7635be791c22e