Optimize & reorder test imports after refactoring