Merge "Have the EC2 instance test to wait for termination"