Convert more tests to FileCheck.