[IMP] improved imports that were failing test-cases