Replace some more greps with FileChecks in tests