Revert "Revert "Fix unit tests for ExpressionHelperTest""

This reverts commit da36bef6c3f7d364e6accca33fa500085d12aa4c.