bugfixes

Just now got access to a test aws account to run the fix 77e1145.

Fixed a few names in the setup method, removed underscore from
elb name in favor of a dash. Renamed setup to 'setUp'