And holy crap, uncommented some tests that I'd commented early while
working on asyncio and forgot to uncomment before checking in.