ec2 changes: destroy and rebuild added, test was improved