Additional fixes/xfails for icc tests