Add expression evaluator to addition and write some tests.J