#16919: test_crypt now works with unittest test discovery. Patch by Zachary Ware.
#16919: merge with 3.3.