Port more CFC tests to C