refactored zoneAffinityTests to be compact and support non contigious zones