Fixed testing infrastructure.