Merge "Fix memory leaks in the CFI tests."