Updated tests for EC2.