Added test infrastructure.