Improved test infrastructure.