[BACKLOG-824] - Fixed unit test
Merge pull request #2058 from rmansoor/5.2

[BACKLOG-824] - Fixed unit test