r8498: more test suite speedups. It's down to 5 minutes on my box now