Revert "Fix unit tests for ExpressionHelperTest"

This reverts commit de0c15902f7c3cd0e46edb373e1d737aaa2eff59.