Updated VPC tests
Merge remote-tracking branch 'origin/vpcfixes' into vpcfixes