Add optimizations for testing on EC2