Will Butcher to wait until August to sign NHL deal, will test free agency