Fix Locale test issues