Several updates to the test cases.
Added some basic tests for the new ExpressionEvaluator class.
Forgot to add ExpressionEvaluator to commit 2f9f00a3f3dd79b129e2eddc0b47119105f8d528