Yogesh/Pooja | #0000 | functiona test fix