Zone Affinity test fix