Merge "Enhance unit test coverage: availability_zone_client"