Merge "Add the missing test cnf_conformance"