Use direct CNF algorithm.
Update tests for new CNF function.