Improved testdrivers.