Fix unit tests for ExpressionHelperTest