Remove more local imports for ELB tests