Merge "Two fixes on test_list_available_zones"