Yogesh | #2230 | Functional test fix