Update test and SolverStd
Update test and SolverStd