Heri | #3512 | Fixing tests & refactoring xcel export