Refactor import test and remove data providers