Heri | #NA: Fixing failing functional tests