Michael fixed the race conditions and removed the sleeps.

This is his SF patch 569697.  I renamed main() to test_main() again so
that this is run as part of the standard test suite.