When I made the changes I suggested, all the tests passed on my local checkout in under 5 seconds, but of course that doesn't help us very much since the suggested change doesn't work for the real site. I have some ideas on improving the test performance; I'll follow up with those in the tests section.