Imports processing refactored. Few tests was added.