updated eval-exp and tests