Fixing i18n UTs and presenter UTs