pep8 fixes in the ec2 test file.
Fix EC2 test so it doesn't depend on query param ordering in the URL.