|#162|+Manan| Fixing functionalTests