#769| Fixing functionalTests