Replace AvailZone with AvailabilityZone, and fix tests