Yogesh | #2582 | Fixing failing unit test