Reduces amount of polling during live tests.

I just looked at a log and it seems like we're sending 100+ polling
events during our testing. That is no good.

One issue is that watchers were never killed; they kept polling even
after the test was finished. I've dealt with that now.

I also reduced the frequency of polling, because these tests don't
really need to see all messages instantly.
Merge branch 'message-class' into test