performance values are much better than before (except solving), make test passing