Tweaks to disable i18n for testing