Fix a failing unit test
Merge pull request #2596 from elkuku/ut-1

Fix a failing unit test [#32813]
Removing duplicated part from earlier commit