New Zealand shuffle the pack for Pakistan clash