@embray: Without this set of changes, this test crashes the interpreter when `unicode_literals` is turned on.  I didn't investigate any further...