FileCheckize and merge some tests.