Moved i18n and tests