Jenkins test infrastructure fixes 4