ROBE-218 refactoring and xlsx import test fix