Jenkins test infrastructure fixes