Fix eval usage in tests to conform with eval semantics
Merge remote-tracking branch 'upstream/unstable' into unstable
Merge pull request #1789 from yoav-steinberg/fix_eval_in_tests

Fix eval usage in tests to conform with eval semantics