refactor import tests