#444 | Sandeep| Fixing functional test