Update to CCFR, needing some tests now