Refactor of Import into tools dir - make testable
Test fixing