Continuued to improve Ec2 Test framework.