Convert a few tests to FileCheck for PR5307.