Add CFin and CFid tests.