Fixed a few typos in firewall tests. VPC was being passed instead of the...

... subnet. Also made VPC conditional slightly broaded to include OPTIONAL.