change solve -> evaluate in tests