Minor tweaks, mostly involving the TestDriver.