Add l10n and test