Fix tests and i18n issues