- i18n: Clean up & tests added