Add a CFR test
Minor refactoring to simplify