- fix the tests so that they work better with "make check"
- add the ability to watch for timeouts in the event loop