Reapply "s/grep/FileCheck/ in some tests"