Trent Boult returns to New Zealand Test squad