ROBE-218 refactoring and xls import test fix