Fix Haskell/CNF test suite

The generated test program uses a different name.
Remove a redundant `do`