Melanie/Pooja | #0000 | Fixing functional test