Convert a couple of grep tests to FileCheck.