parallel import - tests are missing, and refactoring