Add waits to address email checkbox failure

This is an attempt to address issue #589. The tests pass locally for me, but I'm honestly not sure whether this will fix the intermittent failure on Saucelabs, but it's worth a try.

Also include PEP8 fixes