Heri | #NA | Fixing some tests