Fix the way Constraint Solver discovers previous solution
WIP test for the conservative cost function in constraint solver