Added more testing infrastructure.