Rename cfi file
Modify test file to use cfi