Update LocalSolver and tests