More changes to the testing infrastructure.