Change some tests to create lighter weight resources to speed things up. Fix bug with reset of VPC tag