Heri | #NA | Fixing functional test