Pooja | #0000 | functional tests fix