Remove CIF dependency for most tests.