Fixing ELB unit tests.  Also did some PEP8 cleanup on ELB code.