Improved test configuration.