Added test infrastructure
Added test infrastructure