organize import on itests