expression evaluator usage fix, better testing