Make sure unsupported locales are converted into the default locale
Fix failures in tests