Added equivalence tests to CNF