Refined expression evaluator and revised tests.