#101 | Manan, Balvinder| Fixing functional Tests