fix failing macro-as-parameter tests in eval.test