Heri | #NA: Fixing functional tests