#16748: test_heapq now works with unittest test discovery.
#16748: merge with 3.3.