Clean up and FileCheck-ize a test.