improved testability
added test for excel-import