modify tests for VPCImpl, ZoneImpl.