Fix eval usage in tests to conform with eval semantics