Adding basic expression evaluator
Cleaning up calculator tests