Improve testing infrastructure.