Jenkins test infrastructure fixes 2