Ajay/Melanie | #0000 | Fixing functional test