Improve the test infrastructure.