Fixing regression test to fit changes in options
Adding optimisation where resolving with gates generates less clauses

Thanks to Marijn Heule for explaining this at SAT&SMT Summer School 2013