Fixed firewall tests to allow testing against the likes of EC2-VPC where VPC is implied even if you didn't ask for it.