Jenkins test infrastructure fixes 3