Updated Solver and SolverTest