Updates to i18n.
Added a unit tests.