Patch up CFG tests