Yogesh | #2588 | Fix failing test