Fix broken tests while adding more languages

Change-Id: I8c180e96bc2fb40582e0fedfd9c8eab430961c59