Fixed tests
Updated default locale charsets
Merge commit '1350dcf'