Enable a broken test and fix it.
Merge fix for broken/disabled test.
#16918: test_codecs now works with unittest test discovery. Patch by Zachary Ware.
#16918: merge with 3.3.