updated eval-expo and tests