Tweaking EC2 tests