updated test infrastructure