Refactored zoneAffinity Test; add non contigious ids test cases