test infrastructure fixed