Changed back to equality check.
Made test data better.
Only run cnfReplace, don't do full conversion to CNF.

Incremental-sat-solver does the conversion itself.
Updated tests.
Started fixing the CNF conversion.