Melanie/Pooja | #2629 | Fixing functional tests