Some test cleanup and tinkering with Twisted trial.