Merge "Fix availability zone API tests"