Allow to specify the algorithm in solve2
Add tests for the pseudo boolean stuff in resolve