Enhanced support for Ec2 testing.