Refactor import test