Fisher in line for ODI debut as NZ return to full strength for WI tour