Refactored zoneAffinity Test; add non contigious ids test cases
fix storage service test affected by turning off server routing