Merge "Fix availability zones tests"