Merge "Add unit test for  availability_zone_client"