Add a test for SHORTEST encoding of utf-8 headers, and also update some of the test values which change because of this.
Add a test for SHORTEST encoding of utf-8 headers, and also update
some of the test values which change because of this.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator