Fix ELB test broken by previous refactor