[BACKLOG-824] - Fixed unit test
Merge pull request #2057 from rmansoor/master

[BACKLOG-824] - Fixed unit test