more i18n test fixups