Removing ec2 from non-test block