Renamed TwoValuePair to SolverSolutionPair, and reverted the changes made in MiniSAT solver