Fix flakey test. (cc #408)
Improve pypy coverage.