Hack: make Python solver use the OCaml solver

All Python unit-tests now pass using the OCaml solver.