Tests refactored 4.0.2

Modified EC2 quota test cases to work with bug GUI-1128.  Tested in IDE and RC environments.