FileCheck'ize and merge tests