#16910: test_bytes, test_unicode, and test_userstring now work with unittest test discovery.  Patch by Zachary Ware.
#16910: merge with 3.3.