[Reassociate] FileCheckize and cleanup a few testcases. No functional change
intended.