Heri | #NA | Fixing func test