Fix tests that expected cfunc_with_if to be something shorter.
Cosmetic fixes