Added test infrastructure