Skip 5 more tests if system can't handle them
Don't reset locale if it's already fine
Merge branch 'skip-more-utf8-tests-if-they-wont-pass'