making these ec2-only tests work again